Merge branch '2.0'

diff --git a/configure.ac b/configure.ac
index 1802d0d..c056f6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([jansson], [2.0.1], [petri@digip.org])
+AC_INIT([jansson], [2.0.1+git], [petri@digip.org])
 
 AM_INIT_AUTOMAKE([1.10 foreign])
 

diff --git a/doc/conf.py b/doc/conf.py
index 6a811b4..7e311b0 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -50,7 +50,7 @@ copyright = u'2009-2011, Petri Lehtinen'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.1'
+release = '2.0.1+git'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/src/jansson.h b/src/jansson.h
index eb24aed..eb021d3 100644 (file)
--- a/src/jansson.h
+++ b/src/jansson.h
@@ -22,10 +22,10 @@ extern "C" {
 
 #define JANSSON_MAJOR_VERSION  2
 #define JANSSON_MINOR_VERSION  0
-#define JANSSON_MICRO_VERSION  1
+#define JANSSON_MICRO_VERSION  255
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.0.1"
+#define JANSSON_VERSION  "2.0.1+git"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */