branch master updated (ef0be51 -> ab52755)
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 ef0be51 [jgitflow-maven-plugin]merging 'release/4.4-rc2' into 'master' adds 9e1882b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9c2cc73 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 24fa7eb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 786bd8b close UI des ecrans de mensurations quan don quitte les captures + reset des listeners de l'ichtyometre pour etre sur qu'il n'y en a qu'un (fixes #7943) adds 5adb922 Merge branch 'feature/7943' into 'develop' adds abb53af 9 décimales pour a dans les rtp (fixes #7944) adds 3286daf Merge branch 'feature/7944' into 'develop' adds a1fc26f [jgitflow-maven-plugin]updating poms for 4.4-rc3 branch with snapshot versions adds 9f0d29a [jgitflow-maven-plugin]updating poms for branch'release/4.4-rc3' with non-snapshot versions adds ab52755 [jgitflow-maven-plugin]merging 'release/4.4-rc3' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- .../java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java | 6 ++++++ tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/operation/catches/EditCatchesUIHandler.java | 2 ++ .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jaxx | 12 ++++++------ .../tutti/ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 9 ++++++++- .../main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 7 +++++++ 13 files changed, 37 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm