Merge branch 'hotfix/v0.2.1' into develop

Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
	library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
	library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
This commit is contained in:
Matt Williams
2012-12-27 01:08:46 +00:00

View File

@ -26,7 +26,7 @@ PROJECT(PolyVox)
SET(POLYVOX_VERSION_MAJOR "0")
SET(POLYVOX_VERSION_MINOR "2")
SET(POLYVOX_VERSION_PATCH "0")
SET(POLYVOX_VERSION_PATCH "1")
SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}" CACHE STRING "PolyVox version")
MARK_AS_ADVANCED(FORCE POLYVOX_VERSION)