David Williams 5ddc553ef2 Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
	library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
2011-07-30 13:13:48 +01:00
..