]> git.ipfire.org Git - thirdparty/json-c.git/commitdiff
projects / thirdparty / json-c.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e076ae7 8215c0a)
Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sat, 13 Aug 2016 13:17:01 +0000 (09:17 -0400)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sat, 13 Aug 2016 13:17:01 +0000 (09:17 -0400)
Conflicts:
tests/test_util_file.c

1  2 
tests/test1.c patch | diff1 | diff2 | blob | history

diff --cc tests/test1.c
Simple merge
Mirror of https://github.com/json-c/json-c.git