David Williams d9dcf8a33c Merge branch 'develop' into feature/cubiquity-version ...

Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
	library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
	library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
	library/PolyVoxCore/include/PolyVoxCore/Vector.inl
	library/PolyVoxCore/source/Impl/Utility.cpp

2012-12-29 16:44:32 +00:00

..

include/PolyVoxCore

Merge branch 'develop' into feature/cubiquity-version

2012-12-29 16:44:32 +00:00

source

Merge branch 'develop' into feature/cubiquity-version

2012-12-29 16:44:32 +00:00

CMakeLists.txt

Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop

2012-12-29 14:07:11 +00:00