Merge branch 'master' into Werror

Conflicts: src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
parent ef58b0eb54 d545be9614
commit 3caa4a38b9
45 changed files with 663 additions and 649 deletions
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -22,9 +22,6 @@
 #include "Blocks/BlockSlab.h"
 #include "Blocks/ChunkInterface.h"

-#include "Vector3f.h"
-#include "Vector3d.h"
-
 #include "Root.h"

 #include "Authenticator.h"