This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 47f5ab650efbaeb913f2ea7eff34db05308f9648 Merge: 0b44104 f9dd0a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 8 09:55:35 2015 +0100 Faire paraitre le type de marée dans le nom du programme (termine #7701) Merge branch 'feature/7701' into develop .../java/fr/ird/observe/ui/DecoratorService.java | 4 +- .../ird/observe/entities/constants/GearType.java | 16 ++++++- .../observe/entities/referentiel/ProgramImpl.java | 20 ++++++++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37033 -> 37617 bytes .../observe/services/dto/constants/GearType.java | 16 ++++++- .../services/dto/referential/ProgramDto.java | 18 +++++++ .../services/builder/DtoToEntityBuilder.java | 12 +++++ .../services/dto/ObserveDtosInitializer.java | 15 ++++++ .../service/seine/TripSeineServiceTopiaTest.java | 52 ++++++++++----------- 9 files changed, 119 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.