]> 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: bda0540 1d6f914)
Merge branch 'master' into LowercaseLiterals 121/head
authorAndrea Faulds <ajf@ajf.me>
Wed, 12 Feb 2014 09:52:25 +0000 (09:52 +0000)
committerAndrea Faulds <ajf@ajf.me>
Wed, 12 Feb 2014 09:52:25 +0000 (09:52 +0000)

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