This is an automated email from the git hooks/post-receive script. New change to branch master in repository jtimer. See http://git.chorem.org/jtimer.git omits 908849a fixes #984: updates nuiton-config to 3.0-alpha-2 fixes #985: updates commons-collections to 4.0 fixes #957: Updates mavenpom to 4.7 omits ecae970 fixes #983: Add report option to include intermediate total time omits ba6adbb fixes #958: Updates jna to 4.0.0 fixes #959: Updates freemarker to 2.3.20 fixes #960: Updates testng to 6.8.7 omits 194e9eb fixes #957: Updates to mavenpom 4.2 fixes #956: Make webstart starts more friendly omits 38b5e93 fix jnlp config omits 415aa4f [maven-release-plugin] prepare for next development iteration adds 1d6a5d3 [maven-release-plugin] copy for tag jtimer-1.4.3 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (908849a) \ N -- N -- N refs/heads/master (1d6a5d3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 61 ++++++++++------------ .../chorem/jtimer/ui/report/ReportGenerator.java | 15 ++---- .../org/chorem/jtimer/ui/report/ReportView.java | 14 ++--- .../jtimer/ui/report/tree/CheckBoxTreeModel.java | 4 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 4 +- src/main/resources/ftl/reportByDay.ftl | 4 +- src/main/resources/ftl/reportByDay_fr.ftl | 4 +- src/main/resources/ftl/reportByMonth.ftl | 4 +- src/main/resources/ftl/reportByMonth_fr.ftl | 4 +- src/main/resources/ftl/reportByProject.ftl | 2 +- src/main/resources/ftl/reportByProject_fr.ftl | 2 +- src/main/resources/ftl/reportByWeek.ftl | 4 +- src/main/resources/ftl/reportByWeek_fr.ftl | 4 +- src/main/resources/ftl/reportByYear.ftl | 5 +- src/main/resources/ftl/reportByYear_fr.ftl | 5 +- .../ui/report/resources/ReportView.properties | 1 - .../ui/report/resources/ReportView_fr.properties | 1 - src/site/site_en.xml | 4 +- src/site/site_fr.xml | 4 +- .../jtimer/ui/report/ReportGeneratorTest.java | 14 ++--- 20 files changed, 69 insertions(+), 91 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.