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
This commit is contained in:
Eric Haszlakiewicz
2012-07-29 14:06:52 -05:00
7 changed files with 338 additions and 10 deletions

View File

@@ -33,7 +33,7 @@ AM_PROG_LIBTOOL
AC_CONFIG_FILES([
Makefile
json.pc
json-c.pc
tests/Makefile
json-uninstalled.pc
])