diff options
| author | Petri Lehtinen <petri@digip.org> | 2010-02-11 20:55:56 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2010-02-11 20:55:56 +0200 |
| commit | 35ddd2de2058efdb3443760c85a8aa3ce8078584 (patch) | |
| tree | f3db0f4469e58b2f16891c6efe551647c57945cf | |
| parent | f18ef5144a77ebdbe7285711884b217b86e2c3b6 (diff) | |
| download | jansson-35ddd2de2058efdb3443760c85a8aa3ce8078584.zip jansson-35ddd2de2058efdb3443760c85a8aa3ce8078584.tar.gz jansson-35ddd2de2058efdb3443760c85a8aa3ce8078584.tar.bz2 | |
Update CHANGES, change version to 1.2+
| -rw-r--r-- | CHANGES | 9 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -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. |