David Williams d69e840055 Merge branch 'develop' into feature/vertex-refactor
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
	library/PolyVoxCore/source/VertexTypes.cpp
2014-05-11 20:45:31 +02:00
..