This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 45d686d4e71646080c61157b22e72a62b7f877b0 Merge: cb91762 643c4a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 3 12:19:56 2015 +0100 Faire paraitre le type de marée dans le nom du programme (termine #7504) Merge branch 'feature/7504' into develop-4.x .../src/main/java/fr/ird/observe/DecoratorService.java | 3 +-- .../java/fr/ird/observe/entities/constants/GearType.java | 14 ++++++++++---- .../fr/ird/observe/entities/referentiel/ProgramImpl.java | 13 +++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.