David Williams d9da93b6c0 Merge branch 'develop' into feature/opengl ...

Conflicts:
	examples/Basic/CMakeLists.txt
	examples/Basic/OpenGLWidget.cpp
	examples/Basic/OpenGLWidget.h
	include/PolyVox/Impl/Timer.h

2015-02-08 20:49:25 +01:00

..

CMakeLists.txt

Merge branch 'develop' into feature/opengl

2015-02-08 20:49:25 +01:00

main.cpp

Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.

2015-02-07 17:26:36 +01:00

OpenGLWidget.cpp

Merge branch 'develop' into feature/opengl

2015-02-08 20:49:25 +01:00

OpenGLWidget.h

Merge branch 'develop' into feature/opengl

2015-02-08 20:49:25 +01:00