David Williams a51eaa4a02 Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into feature/extractor-refactor ...

Conflicts:
	examples/Basic/main.cpp

2014-05-11 16:21:37 +02:00

..

CMakeLists.txt

This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.

2014-05-05 20:29:52 +02:00

main.cpp

Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into feature/extractor-refactor

2014-05-11 16:21:37 +02:00

OpenGLWidget.cpp

This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.

2014-05-05 20:29:52 +02:00

OpenGLWidget.h

This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.

2014-05-05 20:29:52 +02:00