merge master
This commit is contained in:
@@ -98,9 +98,9 @@ distribution.
|
||||
/* Versioning, past 1.0.14:
|
||||
http://semver.org/
|
||||
*/
|
||||
static const int TIXML2_MAJOR_VERSION = 5;
|
||||
static const int TIXML2_MAJOR_VERSION = 6;
|
||||
static const int TIXML2_MINOR_VERSION = 0;
|
||||
static const int TIXML2_PATCH_VERSION = 1;
|
||||
static const int TIXML2_PATCH_VERSION = 0;
|
||||
|
||||
#define TINYXML2_MAJOR_VERSION 5
|
||||
#define TINYXML2_MINOR_VERSION 0
|
||||
|
||||
Reference in New Issue
Block a user