Daviw Williams 60396a2699 Merge branch 'develop' into feature/cubiquity-version ...

Conflicts:
	library/PolyVoxCore/source/Impl/Utility.cpp

2014-02-25 16:55:52 +01:00

..

include/PolyVoxCore

Eliminating some differences from the cubiquity-version branch.

2014-02-25 16:51:26 +01:00

source

Merge branch 'develop' into feature/cubiquity-version

2014-02-25 16:55:52 +01:00

CMakeLists.txt

Assume C++11 support

2014-02-14 15:03:26 +00:00