branch master updated (e7092d8 -> 34cdce6)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from e7092d8 Merge branch 'release/3.13' adds 6fb60b6 [jgitflow-maven-plugin]updating poms for 3.14-SNAPSHOT development adds fd3b9b7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 84cc016 Merge branch 'master' into develop adds 6741be4 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 71dceba refs #6538 apurement du svg + correction de mise à jour du svg adds 7664aa1 refs #6538 adds f091844 fixes #6660: [CAPTURE] NPE à l'élévation des poids quand il n'y a pas d'espèces adds 70151a6 fixes #6659 Plus de poids affichés dans le résumé suite à des changements de traits adds 91e23a8 fixes #6646: Fenêtre de saisie de mot de passe qui disparaît adds 10eeb53 fixes #6662: Supprimer toute référence à l'Ichtyomètre adds 0b438af fixes #6663: [CAPTURE] Écran de résumé: les pourcentages calculés ne sont pas supprimés après l'action réinitialiser adds 298a80e [jgitflow-maven-plugin]updating poms for branch '3.13.1' with snapshot versions adds 7ec975e [jgitflow-maven-plugin]updating poms for branch'release/3.13.1' with non-snapshot versions adds 34cdce6 Merge branch 'release/3.13.1' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../service/catches/WeightComputingService.java | 8 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../10MF1_Firmware_ifremer_v1-60.eeprom | Bin 32768 -> 0 bytes tutti-ui-swing/src/main/ichtyometer/README.txt | 5 +- .../tutti/ui/swing/action/AbstractTuttiAction.java | 2 +- .../operation/catches/EditCatchesSvgHandler.java | 98 ++++--- tutti-ui-swing/src/main/resources/EcranResume.svg | 310 ++++----------------- 12 files changed, 139 insertions(+), 296 deletions(-) delete mode 100644 tutti-ui-swing/src/main/ichtyometer/10MF1_Firmware_ifremer_v1-60.eeprom -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm