From f26a547fdc216bca49ea2b9b61ed89bf2f301eb3 Mon Sep 17 00:00:00 2001
From: Lee Thomason <leethomason@gmail.com>
Date: Fri, 29 Dec 2017 09:30:39 -0800
Subject: [PATCH] sync the version

---
 CMakeLists.txt | 2 +-
 dox            | 4 ++--
 tinyxml2.h     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff45bb8..f74156d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(CTest)
 ################################
 # set lib version here
 
-set(GENERIC_LIB_VERSION "6.0.0")
+set(GENERIC_LIB_VERSION "6.1.0")
 set(GENERIC_LIB_SOVERSION "6")
 
 ################################
diff --git a/dox b/dox
index 5c97823..8148d34 100644
--- a/dox
+++ b/dox
@@ -39,9 +39,9 @@ PROJECT_NAME           = "TinyXML-2"
 # control system is used.
 
 <<<<<<< HEAD
-PROJECT_NUMBER = 5.0.1
+PROJECT_NUMBER = 6.1.0
 =======
-PROJECT_NUMBER = 6.0.0
+PROJECT_NUMBER = 6.1.0
 >>>>>>> master
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
diff --git a/tinyxml2.h b/tinyxml2.h
index 93483d1..39dd12e 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -99,12 +99,12 @@ distribution.
 	http://semver.org/
 */
 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;
 
-#define TINYXML2_MAJOR_VERSION 5
-#define TINYXML2_MINOR_VERSION 0
-#define TINYXML2_PATCH_VERSION 1
+#define TINYXML2_MAJOR_VERSION 6
+#define TINYXML2_MINOR_VERSION 1
+#define TINYXML2_PATCH_VERSION 0
 
 namespace tinyxml2
 {