Stephen Birarda 8f2dc7e38b resolve conflicts on merge with upstream master		2015-03-03 12:22:25 -08:00
..
external	remove PrioVR from build files	2015-02-26 17:20:45 -08:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	removed at symbol and added enter for teleport box	2015-02-19 14:49:00 -05:00
src	resolve conflicts on merge with upstream master	2015-03-03 12:22:25 -08:00
ui	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2015-03-03 12:22:25 -08:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in