]> granicus.if.org Git - json-c/commitdiff
projects / json-c / 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
Unnamed repository; edit this file 'description' to name the repository.