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
..
2011-07-02 00:57:41 +01:00
2012-11-02 11:45:31 +01:00
2012-11-22 22:23:07 +00:00
2012-02-23 17:08:00 +01:00
2012-12-18 16:25:31 +01:00