Brad Davis c94b8b6e30 Merge branch 'master' into dk1 ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp		2015-05-13 21:25:56 -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	Working on web entities	2015-05-13 00:27:57 -07:00
src	Merge branch 'master' into dk1	2015-05-13 21:25:56 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	Rebasing onto scale changes	2015-05-08 15:09:46 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in