Skip to content
This repository was archived by the owner on May 3, 2019. It is now read-only.

Commit 3cf456b

Browse files
Merge branch 'develop'
2 parents 4a44aa5 + 983ebeb commit 3cf456b

113 files changed

Lines changed: 13981 additions & 11480 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github_changelog_generator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
unreleased=true
2-
future-release=3.3.2
2+
future-release=3.3.3
33
since-tag=2.2.5
44
exclude-tags=Continuous
55
exclude_labels=duplicate,question,invalid,wontfix,rejected,infrastructure,technical task,news,not our bug,discussion,website,support request

3rdparty/spdlog-0.11.0/CMakeLists.txt

Lines changed: 0 additions & 80 deletions
This file was deleted.

3rdparty/spdlog-0.11.0/example/jni/example.cpp

Lines changed: 0 additions & 163 deletions
This file was deleted.

3rdparty/spdlog-0.11.0/include/spdlog/sinks/ansicolor_sink.h

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)