Updated and submodularised JsonCPP

Conflicts: lib/jsoncpp
2015-05-09 01:22:33 +01:00
parent 51a118f1ef
commit ccfe04a0a2
22 changed files with 14 additions and 6527 deletions
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -23,6 +23,8 @@
 #include "OverridesSettingsRepository.h"
 #include "SelfTests.h"

+#include <iostream>
+
 #ifdef _WIN32
 	#include <conio.h>
 	#include <psapi.h>