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
This commit is contained in:
David Williams 2014-05-11 20:45:31 +02:00
commit d69e840055
3 changed files with 11 additions and 10 deletions

View File

@ -0,0 +1 @@