Merge branch 'Werror' into warnings

Conflicts: src/Globals.h
2014-03-12 10:12:13 -07:00
parent 3d15319e3c a584b7b3bc
commit d904e89712
46 changed files with 675 additions and 657 deletions
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -24,7 +24,7 @@
 #include "MersenneTwister.h"

 #include "inifile/iniFile.h"
-#include "Vector3f.h"
+#include "Vector3.h"

 #include <fstream>
 #include <sstream>