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
commit abdb8d99d7
2 changed files with 26 additions and 1 deletions

25
CHANGES
View File

@ -1,3 +1,28 @@
Version 2.3.1
=============
Released 2012-04-20
* Build issues:
- Only use ``long long`` if ``strtoll()`` is also available.
* Documentation:
- Fix the names of library version constants in documentation. (#52)
- Change the tutorial to use GitHub API v3. (#65)
* Tests:
- Make some tests locale independent. (#51)
- Distribute the library exports test in the tarball.
- Make test run on shells that don't support the ``export FOO=bar``
syntax.
Version 2.3 Version 2.3
=========== ===========

View File

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