From: Petri Lehtinen <petri@digip.org>
Date: Mon, 14 Sep 2009 12:06:06 +0000 (+0300)
Subject: Merge branch '1.0'
X-Git-Tag: v1.1~20
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=7728716759b73ee95b84c33a922bdc628dc7d2a9

Merge branch '1.0'

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

7728716759b73ee95b84c33a922bdc628dc7d2a9
diff --cc configure.ac
index 1ad73a9,78d4c74..2835ad3
--- a/configure.ac
+++ b/configure.ac
@@@ -1,5 -1,5 +1,5 @@@
  AC_PREREQ([2.63])
- AC_INIT([jansson], [1.0.2+], [petri@digip.org])
 -AC_INIT([jansson], [1.0.3], [petri@digip.org])
++AC_INIT([jansson], [1.0.3+], [petri@digip.org])
  
  AM_INIT_AUTOMAKE([1.10 foreign])
  
diff --cc doc/conf.py
index 911436a,4d6bb7f..3ccd920
--- 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.2+'
 -release = '1.0.3'
++release = '1.0.3+'
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
diff --cc src/Makefile.am
index 5165476,04dfae0..a737c90
--- 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:2:0
+ libjansson_la_LDFLAGS = -version-info 0:3:0
  
 -AM_CFLAGS = -Wall -Wextra -Werror -std=c99
 +AM_CFLAGS = -Wall -Wextra -Werror