aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES9
-rw-r--r--configure.ac2
-rw-r--r--doc/conf.py2
3 files changed, 11 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 02f28c4..dcbf6a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+Version 1.3 (in development)
+============================
+
+* New encoding flags:
+
+ - ``JSON_PRESERVE_ORDER``: Preserve the insertion order of object
+ keys.
+
+
Version 1.2
===========
diff --git a/configure.ac b/configure.ac
index 5290793..17f1e01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.59])
-AC_INIT([jansson], [1.2], [petri@digip.org])
+AC_INIT([jansson], [1.2+], [petri@digip.org])
AM_INIT_AUTOMAKE([1.10 foreign])
diff --git a/doc/conf.py b/doc/conf.py
index f4ec126..2a95aad 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -52,7 +52,7 @@ copyright = u'2009, 2010 Petri Lehtinen'
# The short X.Y version.
version = '1.2'
# The full version, including alpha/beta/rc tags.
-release = '1.2'
+release = '1.2+'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.