Sam Cake 8324268ec8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange		2015-05-13 11:32:39 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Merge pull request #4701 from jherico/infoview	2015-05-06 12:12:21 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 11:32:39 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	add a macro to recursively correctly handle resources	2015-04-27 16:02:52 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in