Stephen Birarda 41c6220731 resolve conflicts on merge with upstream/master		2015-07-31 17:27:23 -07:00
..
external	The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351	2015-07-27 19:04:49 +02:00
icon
resources
src	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
ui
CMakeLists.txt	A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU	2015-07-29 14:42:24 -07:00
interface_en.ts
InterfaceVersion.h.in