This is an automated email from the git hooks/post-receive script. New change to branch master in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from e30532c [jgitflow-maven-plugin]merging 'release/1.6-alpha-1' into 'master' adds 5a884c9 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development adds 00d5675 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b72dd89 [jgitflow-maven-plugin]merging 'master' into 'develop' adds bb2dc72 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 40a9254 reworked sync to make one sync at startup, and then sync the tasks when the time changes adds 6831f4b forced repaint on url deletion, to display the change on the jtable adds a4777c3 removed Timer(), no longer useful adds 12a4d17 correction of log file adds 5bfe240 Merge branch 'feature/1365_problem_synchro' into 'develop' adds e234947 adds subtasks times to task sync if they have no syncInfo adds d3e4854 removed useless import adds 1906468 Merge branch 'feature/1364_sous_taches' into 'develop' adds c01ffc9 [jgitflow-maven-plugin]updating poms for 1.6-alpha-2 branch with snapshot versions adds bb832ce [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-2' with non-snapshot versions adds b0179f3 [jgitflow-maven-plugin]merging 'release/1.6-alpha-2' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- src/main/java/org/chorem/jtimer/JTimerConfig.java | 9 - src/main/java/org/chorem/jtimer/JTimerFactory.java | 4 - .../java/org/chorem/jtimer/entities/TimerTask.java | 7 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 143 ++++++-------- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 4 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 220 ++++++++++----------- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 5 +- .../jtimer/entities/TimerTaskHelperTest.java | 33 +++- 9 files changed, 201 insertions(+), 226 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.