overte/libraries/render-utils
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
..
res/fonts move fonts to sdff files, load with qrc 2015-02-06 11:48:55 -08:00
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-13 12:54:19 -07:00
CMakeLists.txt Working on mac functionality 2015-07-02 18:14:12 -07:00