This is an automated email from the git hooks/post-receive script. New change to branch master-4.x in repository observe. See http://git.codelutin.com/observe.git from 00b9303 [jgitflow-maven-plugin]merging 'release/4.0.4' into 'master' adds 664c1f4 [jgitflow-maven-plugin]updating poms for 4.0.5-SNAPSHOT development adds d186b89 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1938e3d [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' adds 6d33b8d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds b47b376 La maintenance se fait désormais sur master-4.x adds 189f0e5 Bien réinitialiser tous les champs précédemment calculé lors d'une opération de consolidation (See #7692) adds 33f75da [PS] Calculs taille/poids : Problème sur recalcul (termine #7692) Merge branch 'feature/7692' into develop-4.x adds f6922f2 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions adds e5c1ba8 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master-4.x' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- .../fr/ird/observe/ConsolidateDataService.java | 87 +++++++++++++++++----- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 3 +- 6 files changed, 75 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.