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/World.cpp
+++ b/src/World.cpp
@@ -46,7 +46,6 @@
 #include "Generating/Trees.h"
 #include "Bindings/PluginManager.h"
 #include "Blocks/BlockHandler.h"
-#include "Vector3d.h"

 #include "Tracer.h"