David Williams 74f25eac23 Merge branch 'develop' into feature/cmake-cxx11-detect ...

Conflicts:
	examples/Basic/CMakeLists.txt
	examples/OpenGL/CMakeLists.txt
	examples/Paging/CMakeLists.txt
	examples/SmoothLOD/CMakeLists.txt
	library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h

2012-12-24 20:08:31 +00:00

4.9 KiB

Raw Blame History

View Raw