This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 4ae72803b3d9775eb30f10d13aea7d7c6031be51 Merge: dbaf1ea 3be764d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 16:44:06 2016 +0200 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../service/sampling/CruiseSamplingCache.java | 249 ++++++++++++++++++--- .../sampling/CruiseSamplingInternalCache.java | 98 ++++++-- .../tutti/service/sampling/SamplingEvent.java | 35 +-- .../tutti/service/sampling/SamplingListener.java | 1 + .../frequency/IndividualObservationUICache.java | 173 +++++++++++--- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 37 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +- 10 files changed, 498 insertions(+), 108 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.