From: Petri Lehtinen <petri@digip.org>
Date: Sun, 8 Nov 2009 20:01:02 +0000 (+0200)
Subject: Merge branch '1.1'
X-Git-Tag: v1.2~24
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=e0a88d19d1f103c32bbaf4c20a83575413c4bf80

Merge branch '1.1'

Conflicts:
	configure.ac
	doc/conf.py
---

e0a88d19d1f103c32bbaf4c20a83575413c4bf80
diff --cc configure.ac
index 3a35945,1a6f7e7..8de9c05
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.59])
- AC_INIT([jansson], [1.1.1+], [petri@digip.org])
 -AC_INIT([jansson], [1.1.2], [petri@digip.org])
++AC_INIT([jansson], [1.1.2+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  
diff --cc doc/conf.py
index 02b4c79,be257e1..c13315a
--- a/doc/conf.py
+++ b/doc/conf.py
@@@ -52,7 -52,7 +52,7 @@@ copyright = u'2009, Petri Lehtinen
  # The short X.Y version.
  version = '1.1'
  # The full version, including alpha/beta/rc tags.
- release = '1.1.1+'
 -release = '1.1.2'
++release = '1.1.2+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.