From 2cd0f4ec214f5980648d86014c17b7cb5026f5fa Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Tue, 20 Jan 2015 12:44:49 -0600 Subject: [PATCH] 1.2.0 <- 1.1.1 `operator=()` (which already performed a deep-copy) now includes comments. The change is probably harmless in all practical cases. --- include/json/version.h | 6 +++--- version | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/json/version.h b/include/json/version.h index baf5daa..4565dc1 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.1.1" +# define JSONCPP_VERSION_STRING "1.2.0" # define JSONCPP_VERSION_MAJOR 1 -# define JSONCPP_VERSION_MINOR 1 -# define JSONCPP_VERSION_PATCH 1 +# define JSONCPP_VERSION_MINOR 2 +# 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)) diff --git a/version b/version index cd075f2..de23bf3 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.1.1 \ No newline at end of file +1.2.0 \ No newline at end of file