]> 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: f22de2c 1abaaee)
Merge remote-tracking branch 'origin/master' into json-c-0.10 json-c-0.10-20120530
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 29 Apr 2012 17:55:43 +0000 (12:55 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 29 Apr 2012 17:55:43 +0000 (12:55 -0500)

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