]> granicus.if.org Git - json-c/commitdiff
Merge branch 'json_deep_copy' of https://github.com/commodo/json-c into commodo-json_...
authorEric Haszlakiewicz <erh+git@nimenees.com>
Wed, 29 Nov 2017 14:12:59 +0000 (09:12 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Wed, 29 Nov 2017 14:12:59 +0000 (09:12 -0500)
1  2 
.gitignore
json_object.c
json_object.h

diff --cc .gitignore
index 80a2309a5660e5117cdcaca77537c5d31012450a,c2b9b8999f7558240b24cb2c77f27f348d778ed8..6347caa448f282d72e917fae985d01b524b884fc
  /tests/test_cast
  /tests/test_charcase
  /tests/test_compare
+ /tests/test_deep_copy
  /tests/test_double_serializer
  /tests/test_float
 +/tests/test_int_add
  /tests/test_json_pointer
  /tests/test_locale
  /tests/test_null
diff --cc json_object.c
Simple merge
diff --cc json_object.h
Simple merge