| commit | c2d3ccf3af079d7b155b50e3974a5851af024383 | [log] [tgz] |
|---|---|---|
| author | Eric Haszlakiewicz <erh+git@nimenees.com> | Sun Jul 29 14:06:52 2012 -0500 |
| committer | Eric Haszlakiewicz <erh+git@nimenees.com> | Sun Jul 29 14:06:52 2012 -0500 |
| tree | 904d499f7a5a6803ef32fae0e3fc8aa15043a2bf | |
| parent | 92f31bd99a3c5f7d7ea7c2fd1ab56d83caf786b0 [diff] | |
| parent | 65f649b7ba6bde1d42d8d9b4051eff47aec04099 [diff] |
Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_library Conflicts: .gitignore Makefile.am configure.in printbuf.c test1.c test1.expected