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:
commit
c2d3ccf3af
7 files changed
+338
-10
No files matched your search
+1
-1
@@ -33,7 +33,7 @@ AM_PROG_LIBTOOL
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
json.pc
|
||||
json-c.pc
|
||||
tests/Makefile
|
||||
json-uninstalled.pc
|
||||
])
|
||||
|
||||
Reference in new issue
Block a user