David Williams
f2ba500c4c
Merge branch 'develop' into feature/vertex-refactor
Conflicts:
examples/Basic/main.cpp
examples/Paging/main.cpp
examples/SmoothLOD/main.cpp
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.h
tests/TestCubicSurfaceExtractor.cpp
tests/TestSurfaceExtractor.cpp
tests/TestVolumeSubclass.cpp
2014-05-12 23:04:19 +02:00
..
2014-05-05 20:29:52 +02:00
2012-10-28 15:41:53 +00:00
2011-07-17 00:50:02 +01:00
2011-07-02 00:57:41 +01:00
2011-07-17 00:50:02 +01:00
2013-06-13 16:49:02 +02:00
2011-07-17 00:50:02 +01:00
2014-05-12 23:04:19 +02:00
2012-03-27 16:06:43 +02:00
2013-06-12 15:11:45 +02:00
2011-08-13 08:57:45 +01:00
2011-05-17 22:27:46 +01:00
2010-12-21 21:11:36 +00:00
2013-05-14 15:44:56 +02:00
2013-05-01 22:28:46 +01:00
2012-12-02 17:33:59 +01:00
2012-02-23 17:08:00 +01:00
2012-12-26 00:31:10 +00:00
2011-09-24 11:02:01 +01:00
2011-09-24 11:02:01 +01:00
2014-05-12 23:04:19 +02:00
2013-01-16 15:31:52 +00:00
2012-02-19 11:24:46 +01:00
2012-12-26 00:31:10 +00:00
2012-11-29 18:16:32 +01:00
2011-09-24 11:02:01 +01:00
2013-07-30 17:01:27 +02:00
2013-07-29 16:04:01 +02:00
2014-05-12 23:04:19 +02:00
2011-07-30 10:12:28 +01:00