]> 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: b2c5969 996be85)
Merge branch 'doctaweeks-fixes-for-upstream'
authorEric Haszlakiewicz <erh+git@nimenees.com>
Mon, 23 May 2016 02:12:51 +0000 (02:12 +0000)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Mon, 23 May 2016 02:12:51 +0000 (02:12 +0000)

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