]> git.ipfire.org Git - thirdparty/json-c.git/commit
Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master
authorEric Haszlakiewicz <erh+git@nimenees.com>
Wed, 12 Feb 2014 04:05:54 +0000 (23:05 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Wed, 12 Feb 2014 04:05:54 +0000 (23:05 -0500)
commitc8e0497d4759a1e0a1f3a806fc239e055b845827
tree006ee318f0f8603495ed63b1a285863a05a666e6
parenta2c078fc6eaf92dfe68d11bc2089e9e7c91f47c0
parent311686f63ed26e510c50808977c31883fe7bc23d
Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master

Conflicts:
Makefile.am
Makefile.am
configure.ac