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 4ce3f36bc79e2efef711ea641d54e0e2ffdcef29 Merge: 55fe697 d7d8bde Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 16 15:29:47 2014 +0100 fixes #6106: [TECH] pouvoir spécifier le chemin de génération de l'export générique dans la configuration Merge branch 'feature/6106' into develop pom.xml | 4 ++-- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 10 ++++++++++ .../main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/tutti-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java | 6 ++++-- .../fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java | 6 ++++-- .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 10 files changed, 34 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.