overte/libraries/gpu
Brad Davis 9eb15d3d55 Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/GLCanvas.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	libraries/render-utils/src/DeferredLightingEffect.cpp
2015-07-13 12:54:19 -07:00
..
src/gpu Merge remote-tracking branch 'upstream/master' into plugins 2015-07-13 12:54:19 -07:00
CMakeLists.txt Trying to fixup the plugins compilation 2015-07-02 00:00:00 -07:00