overte/interface
Brad Davis a83a4fb0a1 Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/ui/ApplicationOverlay.cpp
2015-06-17 19:53:31 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon fix check for debug/release icon 2015-01-30 15:41:44 -08:00
resources Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 15:34:50 -07:00
src Merge remote-tracking branch 'upstream/master' into overlay 2015-06-17 19:53:31 -07:00
ui Checkpoint auto updater 2015-06-02 19:32:03 -06:00
CMakeLists.txt Code Review changes 2015-06-10 14:35:52 -06:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in