Sam Gateau 7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1		2015-04-06 10:20:23 -07:00
..
external	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -07:00
icon
resources
src	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-04-06 10:20:23 -07:00
ui	Update script editor to set icons programatically	2015-04-02 09:10:47 -07:00
CMakeLists.txt
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in