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 3a73396 Merge branch 'feature/7946' into 'develop' adds b740291 Ajout de l'option dans la configuration pour dicter ou non les unités (See #7948) adds 00496c3 Permettre de ne pas lire les unités l'option est désactivée (See #7948) adds 95579a0 modif du nom de la conf adds de81b68 Merge branch 'feature/ajout_option_ne_pas_lire_unite' into 'develop' No new revisions were added by this update. Summary of changes: .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++++ .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../main/resources/i18n/tutti-persistence_en_GB.properties | 1 + .../main/resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../java/fr/ifremer/tutti/ui/swing/util/SoundEngine.java | 12 +++++++++--- .../main/java/fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 7 +++++-- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + .../test/java/fr/ifremer/tutti/ui/swing/SoundUtilTest.java | 7 +++++-- 10 files changed, 38 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.