Merge branch 'develop'

ColinDuquesnoy · Feb 10, 2018 · 3cf456b · 3cf456b
2 parents 4a44aa5 + 983ebeb
commit 3cf456b
Show file tree

Hide file tree

Showing 113 changed files with 13,981 additions and 11,480 deletions.
diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -1,5 +1,5 @@
 unreleased=true
-future-release=3.3.2
+future-release=3.3.3
 since-tag=2.2.5
 exclude-tags=Continuous
 exclude_labels=duplicate,question,invalid,wontfix,rejected,infrastructure,technical task,news,not our bug,discussion,website,support request

diff --git a/3rdparty/spdlog-0.11.0/CMakeLists.txt b/3rdparty/spdlog-0.11.0/CMakeLists.txt
diff --git a/3rdparty/spdlog-0.11.0/example/jni/example.cpp b/3rdparty/spdlog-0.11.0/example/jni/example.cpp
diff --git a/3rdparty/spdlog-0.11.0/include/spdlog/sinks/ansicolor_sink.h b/3rdparty/spdlog-0.11.0/include/spdlog/sinks/ansicolor_sink.h