commit cdbc35f6acd13069d9fc99b112a1ed1371bb0e1e
author Christopher Dunn <cdunn2001@gmail.com> Sun Mar 08 12:57:13 2015 -0500
committer Christopher Dunn <cdunn2001@gmail.com> Sun Mar 08 12:57:13 2015 -0500
tree 97bb9dfc2309baf747ae83b035c699f08a5fdba3
parent 4e30c4fcdb93cd0670f00eddf89fc5e900b86295

1.6.0

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf770f5..5fba09d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@
 #SET( JSONCPP_VERSION_MAJOR X )
 #SET( JSONCPP_VERSION_MINOR Y )
 #SET( JSONCPP_VERSION_PATCH Z )
-SET( JSONCPP_VERSION 1.5.4 )
+SET( JSONCPP_VERSION 1.6.0 )
 jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION )
 #IF(NOT JSONCPP_VERSION_FOUND)
 #    MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z")

include/json/version.h

diff --git a/include/json/version.h b/include/json/version.h
index 1b23ae1..9a7a00f 100644
--- a/include/json/version.h
+++ b/include/json/version.h
@@ -4,10 +4,10 @@
 #ifndef JSON_VERSION_H_INCLUDED
 # define JSON_VERSION_H_INCLUDED
 
-# define JSONCPP_VERSION_STRING "1.5.4"
+# define JSONCPP_VERSION_STRING "1.6.0"
 # define JSONCPP_VERSION_MAJOR 1
-# define JSONCPP_VERSION_MINOR 5
-# define JSONCPP_VERSION_PATCH 4
+# define JSONCPP_VERSION_MINOR 6
+# define JSONCPP_VERSION_PATCH 0
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
 

version

diff --git a/version b/version
index 94fe62c..dc1e644 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.5.4
+1.6.0