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
@@ -11,7 +11,7 @@
|
||||
/configure
|
||||
/depcomp
|
||||
/install-sh
|
||||
/json.pc
|
||||
/json-c.pc
|
||||
/libtool
|
||||
/ltmain.sh
|
||||
/Makefile
|
||||
|
||||
Reference in new issue
Block a user