From: Petri Lehtinen <petri@digip.org>
Date: Wed, 4 Nov 2009 20:10:46 +0000 (+0200)
Subject: Merge branch '1.1'
X-Git-Tag: v1.2~25
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=17d913307e60d1c3e41d01d9a4be81892d610b3f

Merge branch '1.1'

Conflicts:
	test/.gitignore
	test/testprogs/Makefile.am
---

17d913307e60d1c3e41d01d9a4be81892d610b3f
diff --cc test/.gitignore
index 6f12c1f,ac70552..1999944
--- a/test/.gitignore
+++ b/test/.gitignore
@@@ -3,7 -3,7 +3,8 @@@ loads_dump
  load_file_dump_file
  testlogs
  testprogs/test_array
 +testprogs/test_dump
+ testprogs/test_load
  testprogs/test_number
  testprogs/test_object
  testprogs/test_simple
diff --cc test/testprogs/Makefile.am
index 792196a,41807ed..308b9a5
--- a/test/testprogs/Makefile.am
+++ b/test/testprogs/Makefile.am
@@@ -1,7 -1,7 +1,8 @@@
- check_PROGRAMS = test_array test_dump test_simple test_number test_object
 -check_PROGRAMS = test_array test_load test_simple test_number test_object
++check_PROGRAMS = test_array test_dump test_load test_simple test_number test_object
  
  test_array_SOURCES = test_array.c util.h
 +test_dump_SOURCES = test_dump.c util.h
+ test_load_SOURCES = test_load.c util.h
  test_simple_SOURCES = test_simple.c util.h
  test_number_SOURCES = test_number.c util.h
  test_object_SOURCES = test_object.c util.h