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 cc4e98127a29ff2551c9e97ba7bec42d463051b3 Merge: f9f19a0 c30c018 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Oct 5 15:46:31 2015 +0200 refs #7620 Il reste encore le pb des traductions à revoir Merge branch 'feature/7620' into develop .../v1/longline/TripLonglineServiceController.java | 6 ++ .../v1/seine/TripSeineServiceController.java | 6 ++ observe-entities/pom.xml | 6 ++ .../entities/longline/TripLonglineTopiaDao.java | 32 +++++----- .../observe/entities/seine/TripSeineTopiaDao.java | 18 +++--- .../java/fr/ird/observe/tripMap/TripMapPoint.java | 71 --------------------- .../service/longline/TripLonglineService.java | 4 ++ .../services/service/seine/TripSeineService.java | 4 ++ .../services/dto/constants}/TripMapPointType.java | 2 +- .../xmi/observe-services-dto-common.properties | 1 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 39020 -> 41878 bytes .../services/dto/ObserveDtosInitializer.java | 10 +++ .../service/longline/TripLonglineServiceTopia.java | 16 +++++ .../service/seine/TripSeineServiceTopia.java | 16 +++++ 14 files changed, 95 insertions(+), 97 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.