Skip to content
Browse files

Moved merge leftovers.

  • Loading branch information...
1 parent 725c5b6 commit d8eebefd499183cd077d073dad893eaa9bb22478 @rjeczalik rjeczalik committed Dec 20, 2012
View
0 jsoncpp/amalgamate.py → amalgamate.py
File renamed without changes.
View
0 jsoncpp/include/json/assertions.h → include/json/assertions.h
File renamed without changes.
View
10 jsoncpp/.gitignore
@@ -1,10 +0,0 @@
-*.pyc
-*.swp
-
-*.actual
-*.actual-rewrite
-*.process-output
-*.rewrite
-bin/
-buildscons/
-libs/
View
0 jsoncpp/test/data/fail_test_array_01.json → test/data/fail_test_array_01.json
File renamed without changes.
View
0 jsoncpp/test/data/test_array_07.expected → test/data/test_array_07.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_array_07.json → test/data/test_array_07.json
File renamed without changes.
View
0 jsoncpp/test/data/test_real_08.expected → test/data/test_real_08.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_real_08.json → test/data/test_real_08.json
File renamed without changes.
View
0 jsoncpp/test/data/test_real_09.expected → test/data/test_real_09.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_real_09.json → test/data/test_real_09.json
File renamed without changes.
View
0 jsoncpp/test/data/test_real_10.expected → test/data/test_real_10.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_real_10.json → test/data/test_real_10.json
File renamed without changes.
View
0 jsoncpp/test/data/test_real_11.expected → test/data/test_real_11.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_real_11.json → test/data/test_real_11.json
File renamed without changes.
View
0 jsoncpp/test/data/test_real_12.expected → test/data/test_real_12.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_real_12.json → test/data/test_real_12.json
File renamed without changes.
View
0 jsoncpp/test/data/test_string_04.expected → test/data/test_string_04.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_string_04.json → test/data/test_string_04.json
File renamed without changes.
View
0 jsoncpp/test/data/test_string_05.expected → test/data/test_string_05.expected
File renamed without changes.
View
0 jsoncpp/test/data/test_string_05.json → test/data/test_string_05.json
File renamed without changes.

0 comments on commit d8eebef

Please sign in to comment.
Something went wrong with that request. Please try again.