This is an automated email from the git hooks/post-receive script. New commit to branch master in repository nuiton-profiling. See https://gitlab.nuiton.org/nuiton/nuiton-profiling.git commit d67ef6835820ca77127888175f0390987c6cf1dc Merge: 8086d92 3905eb0 Author: Éric <chatellier@codelutin.com> Date: Wed Jun 24 11:53:43 2020 +0200 Merge branch 'release/3.1' .gitignore | 7 ++ README.txt => README.md | 0 changelog.txt | 1 - pom.xml | 85 +++++++--------------- src/main/java/org/nuiton/profiling/Counter.java | 2 - .../java/org/nuiton/profiling/NuitonTrace.java | 14 ++-- src/main/java/org/nuiton/profiling/Statistic.java | 2 - .../java/org/nuiton/profiling/StatisticMemory.java | 2 - .../java/org/nuiton/profiling/StatisticMethod.java | 2 - .../java/org/nuiton/profiling/StatisticTrace.java | 2 - src/main/java/org/nuiton/profiling/Trace.java | 8 +- src/main/java/org/nuiton/profiling/Unit.java | 2 - src/main/java/org/nuiton/profiling/WebService.java | 3 +- src/main/resources/nuiton-js/wro.properties | 2 - src/main/resources/nuiton-js/wro.xml | 5 +- .../resources/org/nuiton/profiling/web/index.html | 63 ++++++++-------- .../org/nuiton/profiling/web/nuiton-profiling.css | 12 +-- .../org/nuiton/profiling/web/nuiton-profiling.js | 6 +- src/site/apt/index.apt.vm | 5 +- src/site/apt/other-usage.apt.vm | 25 ++++++- src/site/apt/screenshot.apt.vm | 5 +- src/site/apt/simple-usage.apt.vm | 21 ++++++ src/site/{site_fr.xml => site.xml} | 76 +++++-------------- .../java/org/nuiton/profiling/NuitonTraceTest.java | 5 +- src/test/java/org/nuiton/profiling/UnitTest.java | 2 - src/test/resources/META-INF/aop.xml | 5 +- src/test/resources/log4j.properties | 5 +- 27 files changed, 155 insertions(+), 212 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.