Stephen Birarda 60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android		2015-01-19 12:35:22 -08:00
..
external
resources
src	Merge branch 'master' of https://github.com/highfidelity/hifi into android	2015-01-19 12:35:22 -08:00
ui
CMakeLists.txt
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in