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

Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl

2014-01-28 23:39:22 +01:00

..

include/PolyVoxCore

Merge branch 'develop' into feature/cubiquity-version

2014-01-28 23:39:22 +01:00

source

Merge branch 'develop' into feature/cubiquity-version

2014-01-28 23:39:22 +01:00

CMakeLists.txt

Separated logging code into different .cpp/.h files.

2014-01-24 15:21:59 +01:00