This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 1e6e94ca5a242c91e843e1a7df93792613e754bf Merge: e5c1ba8 7d0b2bf Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:05 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master-4.x' observe-business/pom.xml | 2 +- .../main/java/fr/ird/observe/DecoratorService.java | 5 ++- .../main/java/fr/ird/observe/IObserveConfig.java | 7 +++ .../fr/ird/observe/ObserveApplicationContext.java | 4 -- .../java/fr/ird/observe/db/impl/H2DataSource.java | 16 +++++++ .../decorator/GearCaracteristicDecorator.java | 25 +++++++---- .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + observe-entities/pom.xml | 2 +- .../observe/entities/referentiel/ProgramImpl.java | 2 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 35711 -> 35656 bytes observe-swing/pom.xml | 2 +- observe-swing/src/main/assembly/dist/go.bat | 2 +- observe-swing/src/main/assembly/dist/go.sh | 4 +- .../main/java/fr/ird/observe/ObserveConfig.java | 7 +++ .../main/java/fr/ird/observe/ObserveContext.java | 47 ++++++++++++++++++++- .../main/java/fr/ird/observe/ObserveRunner.java | 25 ++++++++--- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../ui/content/impl/seine/FloatingObjectUI.css | 2 +- .../observe/ui/content/impl/seine/SetSeineUI.css | 2 +- .../content/table/impl/seine/AbstractSampleUI.css | 2 +- .../content/table/impl/seine/NonTargetSampleUI.css | 2 +- .../ui/content/table/impl/seine/TargetSampleUI.css | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 10 ----- .../fr/ird/observe/ui/storage/StorageUIModel.java | 6 +-- observe-validation/pom.xml | 2 +- .../field/AbstractEspeceFieldValidator.java | 2 +- pom.xml | 13 +++--- src/site/site_fr.xml | 16 +++++-- 30 files changed, 155 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.