Petri Lehtinen 8d75235ff2 Merge branch '1.2' ...

Conflicts:
	LICENSE

2010-02-04 21:13:57 +02:00

..

check-exports

Add functions json_object_iter_{at,set,set_new}

2010-02-01 21:07:19 +02:00

Makefile.am

Merge branch 'c++-api'

2010-01-21 22:29:26 +02:00

run

Merge branch '1.2'

2010-02-04 21:13:57 +02:00

test_array.c

Add year 2010 to copyright notices

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

test_copy.c

Add year 2010 to copyright notices

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

test_cpp.cpp

C++: Fix test_cpp.cpp to work with VPATH builds

2010-02-04 21:10:04 +02:00

test_cpp.json

C++: Rename test.json to test_cpp.json

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

test_equal.c

Add year 2010 to copyright notices

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

test_load.c

Add year 2010 to copyright notices

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

test_number.c

Add year 2010 to copyright notices

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

test_object.c

Merge branch '1.2'

2010-02-04 21:13:57 +02:00

test_simple.c

Add year 2010 to copyright notices

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

util.h

Add year 2010 to copyright notices

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