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 ce0400b5cd1031526c513ff14864c772c597044d Merge: c89f5a5 c3acac6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu May 28 14:22:47 2015 +0200 Merge branch 'feature/7154' into develop .../entities/longline/TripLonglineDAOImpl.java | 37 +++--- .../observe/ui/util/tripMap/ObserveMapPane.java | 33 ++++- .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 7 +- .../ui/util/tripMap/TripMapContentBuilder.java | 103 ++++++++------- observe-swing/src/main/map/style.xml | 143 +++++++++++++++++++-- 5 files changed, 242 insertions(+), 81 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.