Conflicts: library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl library/PolyVoxCore/source/VertexTypes.cpp
Conflicts: library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl library/PolyVoxCore/source/VertexTypes.cpp