From ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 9 May 2015 01:22:33 +0100 Subject: Updated and submodularised JsonCPP Conflicts: lib/jsoncpp --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 20f8ea103..9f24ad352 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,6 +28,10 @@ [submodule "lib/libevent"] path = lib/libevent url = https://github.com/mc-server/libevent.git +[submodule "lib/jsoncpp"] + path = lib/jsoncpp + url = https://github.com/open-source-parsers/jsoncpp.git [submodule "lib/TCLAP"] path = lib/TCLAP url = https://github.com/mc-server/TCLAP.git + \ No newline at end of file -- cgit v1.2.3 From e69d4536abba0df83a5aef68b5290dc61501ac42 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 9 Jul 2015 23:43:23 +0100 Subject: Added JsonCPP library location to search paths * Fixed '-dirty' submodule changes Probably fixes an issue somewhere too? --- .gitmodules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 9f24ad352..f3653ec9f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,16 +22,21 @@ [submodule "lib/polarssl"] path = lib/polarssl url = https://github.com/mc-server/polarssl.git + ignore = dirty [submodule "lib/SQLiteCpp"] path = lib/SQLiteCpp url = https://github.com/mc-server/SQLiteCpp.git + ignore = dirty [submodule "lib/libevent"] path = lib/libevent url = https://github.com/mc-server/libevent.git + ignore = dirty [submodule "lib/jsoncpp"] path = lib/jsoncpp url = https://github.com/open-source-parsers/jsoncpp.git + ignore = dirty [submodule "lib/TCLAP"] path = lib/TCLAP url = https://github.com/mc-server/TCLAP.git - \ No newline at end of file + ignore = dirty + -- cgit v1.2.3