branch develop updated (0b438af -> 93dc760)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 0b438af fixes #6663: [CAPTURE] Écran de résumé: les pourcentages calculés ne sont pas supprimés après l'action réinitialiser new bf0c0a0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 298a80e [jgitflow-maven-plugin]updating poms for branch '3.13.1' with snapshot versions new 7ec975e [jgitflow-maven-plugin]updating poms for branch'release/3.13.1' with non-snapshot versions new 34cdce6 Merge branch 'release/3.13.1' new 1f2476d Merge branch 'master' into develop new 93dc760 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 93dc76028d705d00991eac7951ed84e988e2a6c5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:28:01 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 1f2476dc8498231e8b48c644e65a89c010593695 Merge: bf0c0a0 34cdce6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:28:00 2015 +0000 Merge branch 'master' into develop commit bf0c0a09f677fc14288721d643539d04e5e00ac1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:27:59 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 34cdce6018512f0af44489eddf5466b3f90ee647 Merge: e7092d8 7ec975e Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:27:52 2015 +0000 Merge branch 'release/3.13.1' commit 7ec975eef0a5e1f954b00394a8417fff57e17fc2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:22:38 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7ec975eef0a5e1f954b00394a8417fff57e17fc2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:22:38 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13.1' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 719073d..1a81886 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1-SNAPSHOT</version> + <version>3.13.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 8655535..682d5da 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 0aa3820..cdcb359 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index fb64662..592ff3a 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 462bff5..acb5d13 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 333a018..3478518 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 34cdce6018512f0af44489eddf5466b3f90ee647 Merge: e7092d8 7ec975e Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:27:52 2015 +0000 Merge branch 'release/3.13.1' 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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit bf0c0a09f677fc14288721d643539d04e5e00ac1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:27:59 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 447d0be..1a81886 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a873dad..682d5da 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 56f92cf..cdcb359 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 347b320..592ff3a 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index ab763a5..acb5d13 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 90a07d1..3478518 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1f2476dc8498231e8b48c644e65a89c010593695 Merge: bf0c0a0 34cdce6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:28:00 2015 +0000 Merge branch 'master' into develop -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 93dc76028d705d00991eac7951ed84e988e2a6c5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 11:28:01 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1a81886..447d0be 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1</version> + <version>3.14-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 682d5da..a873dad 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index cdcb359..56f92cf 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 592ff3a..347b320 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index acb5d13..ab763a5 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 3478518..90a07d1 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.1</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm