From: Sean Middleditch <sean@middleditch.us>
Date: Tue, 19 Jan 2010 05:26:10 +0000 (-0800)
Subject: Merge branch 'master' of /home/elanthis/Source/janssonxx
X-Git-Tag: v1.3~21^2~3
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=commitdiff_plain;h=2ad4634de51bd06c03d1ba5831247ed865c03506

Merge branch 'master' of /home/elanthis/Source/janssonxx

Conflicts:
	.gitignore
---

2ad4634de51bd06c03d1ba5831247ed865c03506
diff --cc src/jansson-impl.hpp
index 0000000,89242fa..89242fa
mode 000000,100644..100644
--- a/src/jansson-impl.hpp
+++ b/src/jansson-impl.hpp
diff --cc src/jansson.hpp
index 0000000,d3d11b3..d3d11b3
mode 000000,100644..100644
--- a/src/jansson.hpp
+++ b/src/jansson.hpp
diff --cc test/suites/api/test.json
index 0000000,9eea6ad..9eea6ad
mode 000000,100644..100644
--- a/test/suites/api/test.json
+++ b/test/suites/api/test.json
diff --cc test/suites/api/test_cpp.cpp
index 0000000,d69c344..d69c344
mode 000000,100644..100644
--- a/test/suites/api/test_cpp.cpp
+++ b/test/suites/api/test_cpp.cpp