Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-15 07:14:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/interface
History
Brad Davis 359abd6474 Merge branch 'master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/GLCanvas.cpp
	interface/src/GLCanvas.h
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
	libraries/render-utils/src/OffscreenGlCanvas.cpp
	libraries/render-utils/src/OffscreenGlCanvas.h
	libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
..
external
icon
resources Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
src Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
ui Merge fixes 2015-07-13 19:07:44 -07:00
CMakeLists.txt Merge branch 'master' into plugins 2015-07-20 13:33:24 -07:00
interface_en.ts
InterfaceVersion.h.in