David Williams 74f25eac23 Merge branch 'develop' into feature/cmake-cxx11-detect ...

Conflicts:
	examples/Basic/CMakeLists.txt
	examples/OpenGL/CMakeLists.txt
	examples/Paging/CMakeLists.txt
	examples/SmoothLOD/CMakeLists.txt
	library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h

2012-12-24 20:08:31 +00:00

..

CMakeLists.txt

Merge branch 'develop' into feature/cmake-cxx11-detect

2012-12-24 20:08:31 +00:00

main.cpp

Renamed 'PolyVoxImpl' to just 'Impl'.

2012-11-05 17:00:09 +01:00

OpenGLImmediateModeSupport.cpp

Fixed some compiler warnings.

2011-11-28 16:43:40 +00:00

OpenGLImmediateModeSupport.h

Moved headers into subdirectories.

2011-05-17 22:27:46 +01:00

OpenGLSupport.cpp

Move to VS 2010.

2010-05-23 21:51:34 +00:00

OpenGLSupport.h

Moved headers into subdirectories.

2011-05-17 22:27:46 +01:00

OpenGLVertexBufferObjectSupport.cpp

Fixed some compiler warnings.

2011-11-28 16:43:40 +00:00

OpenGLVertexBufferObjectSupport.h

Moved headers into subdirectories.

2011-05-17 22:27:46 +01:00

OpenGLWidget.cpp

Marked some parts of PolyVox as deprecated.

2012-11-09 16:12:26 +01:00

OpenGLWidget.h

Removed use of Vector deprecated operator<.

2012-12-09 14:36:22 +01:00

Shapes.cpp

Fixed conversion warning.

2012-11-16 10:50:46 +01:00

Shapes.h

Tidying up of headers and #includes.

2011-09-04 12:12:30 +01:00