]> 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: e3fb749 1fb87cd)
Merge branch 'Protovision-master'
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sat, 30 Apr 2016 18:53:16 +0000 (18:53 +0000)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sat, 30 Apr 2016 18:53:16 +0000 (18:53 +0000)

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