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 1c18a9eb17d67252270b5603d3a717522c82bbd5 Merge: ab52755 867dfc2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 3 22:48:55 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.4' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 10 ++++++-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++++ .../tutti/persistence/entities/protocol/Rtps.java | 2 +- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/xmi/tutti-persistence.zargo | Bin 59339 -> 59366 bytes tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 12 +++++----- .../tutti/service/pupitri/PupitriImportResult.java | 26 ++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../species/actions/ImportPupitriAction.java | 2 +- .../ui/swing/content/protocol/rtp/RtpEditorUI.jcss | 3 ++- .../content/protocol/rtp/RtpEditorUIModel.java | 13 ++++++----- .../protocol/rtp/actions/CopyMaleRtpAction.java | 2 +- .../ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++--- .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 15 +++++++----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 ++- .../fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 8 +++++-- 28 files changed, 99 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.