Stephen Birarda 407c9d2571 Merge branch 'master' of https://github.com/highfidelity/hifi into atp		2015-07-23 17:13:53 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Working on line height	2015-07-17 14:33:32 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-23 17:13:53 -07:00
ui	Avatar collision sounds.	2015-06-26 16:23:16 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
interface_en.ts
InterfaceVersion.h.in