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

Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/Region.h
	library/PolyVoxCore/source/Region.cpp

2013-06-27 21:40:10 +02:00

..

include/PolyVoxCore

Merge branch 'develop' into feature/cubiquity-version

2013-06-27 21:40:10 +02:00

source

Merge branch 'develop' into feature/cubiquity-version

2013-06-27 21:40:10 +02:00

CMakeLists.txt

Stripped out unused code.

2013-06-26 22:14:01 +02:00