]> 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: 3d88179 020ed64)
Merge branch 'master' of https://github.com/json-c/json-c
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 22 Apr 2012 19:26:06 +0000 (14:26 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 22 Apr 2012 19:26:06 +0000 (14:26 -0500)

Trivial merge
Mirror of https://github.com/json-c/json-c.git