Merge branch '2.3'

Conflicts:
	configure.ac
	doc/conf.py
	src/jansson.h
This commit is contained in:
Petri Lehtinen
2012-04-20 21:41:25 +03:00
2 changed files with 26 additions and 1 deletions

View File

@@ -20,7 +20,7 @@ libjansson_la_SOURCES = \
value.c
libjansson_la_LDFLAGS = \
-export-symbols-regex '^json_' \
-version-info 7:0:3
-version-info 7:1:3
if GCC
# These flags are gcc specific