overte/interface
Brad Davis 8f8bda327c Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/OculusManager.h
2015-06-23 16:54:32 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources Merge remote-tracking branch 'upstream/master' into plugins 2015-06-23 16:54:32 -07:00
src Merge remote-tracking branch 'upstream/master' into plugins 2015-06-23 16:54:32 -07:00
ui Checkpoint auto updater 2015-06-02 19:32:03 -06:00
CMakeLists.txt Merge branch 'master' into plugins 2015-06-22 13:35:40 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in