Merge branch '1.0'

Conflicts:
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen
2009-09-14 15:06:06 +03:00
4 changed files with 13 additions and 3 deletions

View File

@@ -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