Merge branch '1.2'

Conflicts:
	CHANGES
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen
2010-04-03 14:00:59 +03:00
5 changed files with 36 additions and 5 deletions

View File

@@ -15,6 +15,6 @@ libjansson_la_SOURCES = \
value.c
libjansson_la_LDFLAGS = \
-export-symbols-regex '^json_' \
-version-info 2:0:2
-version-info 2:1:2
AM_CFLAGS = -Wall -Wextra -Werror