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

2
.gitignore vendored
View File

@@ -11,7 +11,7 @@
/configure
/depcomp
/install-sh
/json.pc
/json-c.pc
/libtool
/ltmain.sh
/Makefile