]> 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: 295bea2 c8e0497)
Merge branch 'ebassi-master'
authorEric Haszlakiewicz <erh+git@nimenees.com>
Wed, 12 Feb 2014 04:06:19 +0000 (23:06 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Wed, 12 Feb 2014 04:06:19 +0000 (23:06 -0500)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
Mirror of https://github.com/json-c/json-c.git