]> granicus.if.org Git - json-c/commitdiff
projects / json-c / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc3e691 1fceb22)
Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165
authorEric Haszlakiewicz <erh+git@nimenees.com>
Tue, 9 Aug 2016 11:36:54 +0000 (07:36 -0400)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Tue, 9 Aug 2016 11:36:54 +0000 (07:36 -0400)
Conflicts:
tests/test_util_file.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.