Petri Lehtinen 8857aeadfd Merge branch '1.2' ...

Conflicts:
	CHANGES
	configure.ac
	doc/conf.py

2010-04-03 14:00:59 +03:00

..

dump.c

Merge branch '1.2'

2010-03-23 08:15:19 +02:00

hashtable.c

Merge branch '1.2'

2010-03-28 21:44:41 +03:00

hashtable.h

hashtable: Fix typo in comment

2010-02-11 21:17:19 +02:00

jansson_private.h

Implement JSON_PRESERVE_ORDER encoding flag

2010-02-11 20:48:56 +02:00

jansson.h.in

Merge branch '1.2'

2010-03-28 21:44:41 +03:00

jansson.hpp

c++ wrapper: add missing 'inline' statements to various constructors

2010-03-18 14:35:09 +01:00

jansson.ipp

C++: Optimize PropertyProxy

2010-02-08 20:51:09 +02:00

load.c

Estimate real number underflows with 0.0

2010-03-26 21:59:56 +02:00

Makefile.am

Merge branch '1.2'

2010-04-03 14:00:59 +03:00

strbuffer.c

Add year 2010 to copyright notices

2010-02-02 21:26:11 +02:00

strbuffer.h

Add year 2010 to copyright notices

2010-02-02 21:26:11 +02:00

utf.c

Don't include stdint.h anywhere

2010-03-18 07:22:43 +02:00

utf.h

Make int32_t available on all systems

2010-02-06 21:11:41 +02:00

util.h

Add year 2010 to copyright notices

2010-02-02 21:26:11 +02:00

value.c

Merge branch '1.2'

2010-03-28 21:44:41 +03:00