From: Petri Lehtinen <petri@digip.org>
Date: Tue, 8 Sep 2009 14:02:39 +0000 (+0300)
Subject: Merge branch '1.0' into HEAD
X-Git-Tag: v1.1~25
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=55d25665395551e711fa7d971cf76c8acf0b17f1

Merge branch '1.0' into HEAD

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

55d25665395551e711fa7d971cf76c8acf0b17f1
diff --cc configure.ac
index f7fe011,4a8c8e5..1ad73a9
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.63])
- AC_INIT([jansson], [1.0.1+], [petri@digip.org])
 -AC_INIT([jansson], [1.0.2], [petri@digip.org])
++AC_INIT([jansson], [1.0.2+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  
diff --cc doc/conf.py
index bd88c6b,0b0b6a9..911436a
--- 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.0'
  # The full version, including alpha/beta/rc tags.
- release = '1.0.1+'
 -release = '1.0.2'
++release = '1.0.2+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
diff --cc src/Makefile.am
index 50b1e69,528e50a..5165476
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -13,6 -13,6 +13,6 @@@ libjansson_la_SOURCES = 
  	utf.h \
  	util.h \
  	value.c
- libjansson_la_LDFLAGS = -version-info 0:1:0
+ libjansson_la_LDFLAGS = -version-info 0:2:0
  
 -AM_CFLAGS = -Wall -Wextra -Werror -std=c99
 +AM_CFLAGS = -Wall -Wextra -Werror