Petri Lehtinen 4e63fcd55d Merge branch '1.2' ...

Conflicts:
	configure.ac

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

..

bin

Implement JSON_PRESERVE_ORDER encoding flag

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

scripts

Add year 2010 to copyright notices

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

suites

Merge branch '1.2'

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

.gitignore

integrate jansson.hpp into build and test suite

2010-01-18 21:36:02 -08:00

Makefile.am

Distribute some missing files

2010-01-21 21:48:31 +02:00

run-suites

test/run-suites: Be less picky when searching for tests

2010-01-21 21:49:04 +02:00