Stephen Birarda 10be0ee984 resolve conflicts on merge with upstream master		2015-01-19 10:26:56 -08:00
..
external	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01:00
resources
src	resolve conflicts on merge with upstream master	2015-01-19 10:26:56 -08:00
ui	changed "Load Scripts" label to be better understandable	2015-01-13 01:09:28 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216	2015-01-15 02:28:31 +01:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in