potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

sync the version

Browse Source
This commit is contained in:
Lee Thomason
2017-12-29 09:30:39 -08:00
parent f6dc9be122
commit f26a547fdc
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -21,7 +21,7 @@ include(CTest)
################################ ################################
# set lib version here # set lib version here
set(GENERIC_LIB_VERSION "6.0.0") set(GENERIC_LIB_VERSION "6.1.0")
set(GENERIC_LIB_SOVERSION "6") set(GENERIC_LIB_SOVERSION "6")
################################ ################################

4
dox
View File

@@ -39,9 +39,9 @@ PROJECT_NAME = "TinyXML-2"
# control system is used. # control system is used.
<<<<<<< HEAD <<<<<<< HEAD
PROJECT_NUMBER = 5.0.1 PROJECT_NUMBER = 6.1.0
======= =======
PROJECT_NUMBER = 6.0.0 PROJECT_NUMBER = 6.1.0
>>>>>>> master >>>>>>> master
# Using the PROJECT_BRIEF tag one can provide an optional one line description # Using the PROJECT_BRIEF tag one can provide an optional one line description

8
tinyxml2.h
View File

@@ -99,12 +99,12 @@ distribution.
http://semver.org/ http://semver.org/
*/ */
static const int TIXML2_MAJOR_VERSION = 6; static const int TIXML2_MAJOR_VERSION = 6;
static const int TIXML2_MINOR_VERSION = 0; static const int TIXML2_MINOR_VERSION = 1;
static const int TIXML2_PATCH_VERSION = 0; static const int TIXML2_PATCH_VERSION = 0;
#define TINYXML2_MAJOR_VERSION 5 #define TINYXML2_MAJOR_VERSION 6
#define TINYXML2_MINOR_VERSION 0 #define TINYXML2_MINOR_VERSION 1
#define TINYXML2_PATCH_VERSION 1 #define TINYXML2_PATCH_VERSION 0
namespace tinyxml2 namespace tinyxml2
{ {