Merge branch 'develop' into feature/cubiquity-version

Conflicts: library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
2014-02-25 16:35:54 +01:00
parent 376ce595d6 0e8973e722
commit aeefe7f938
43 changed files with 38 additions and 604 deletions
--- a/library/PolyVoxCore/source/ArraySizes.cpp
+++ b/library/PolyVoxCore/source/ArraySizes.cpp
@ -23,6 +23,8 @@ freely, subject to the following restrictions:

 #include "PolyVoxCore/ArraySizes.h"

+#include <cstdint>
+
 namespace PolyVox
 {	
 	/**