]> granicus.if.org Git - json-c/commit
projects / json-c / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 92f31bd 65f649b)
Merge branch 'rename_library' of https://github.com/kdopen/json-c into kdopen-rename_...
authorEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 29 Jul 2012 19:06:52 +0000 (14:06 -0500)
committerEric Haszlakiewicz <erh+git@nimenees.com>
Sun, 29 Jul 2012 19:06:52 +0000 (14:06 -0500)
commitc2d3ccf3af079d7b155b50e3974a5851af024383
tree904d499f7a5a6803ef32fae0e3fc8aa15043a2bftree | snapshot
parent92f31bd99a3c5f7d7ea7c2fd1ab56d83caf786b0commit | diff
parent65f649b7ba6bde1d42d8d9b4051eff47aec04099commit | 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
.gitignore diff1 | diff2 | blob | history
Makefile.am diff1 | diff2 | blob | history
configure.in diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.