| commit | c8e0497d4759a1e0a1f3a806fc239e055b845827 | [log] [tgz] |
|---|---|---|
| author | Eric Haszlakiewicz <erh+git@nimenees.com> | Tue Feb 11 23:05:54 2014 -0500 |
| committer | Eric Haszlakiewicz <erh+git@nimenees.com> | Tue Feb 11 23:05:54 2014 -0500 |
| tree | 006ee318f0f8603495ed63b1a285863a05a666e6 | |
| parent | a2c078fc6eaf92dfe68d11bc2089e9e7c91f47c0 [diff] | |
| parent | 311686f63ed26e510c50808977c31883fe7bc23d [diff] |
Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master Conflicts: Makefile.am