Philip Rosedale c3828e4152 Merge pull request #4782 from ctrlaltdavid/20531 ... DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips		2015-05-11 10:18:07 -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 pull request #4782 from ctrlaltdavid/20531	2015-05-11 10:18:07 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-14 13:13:15 -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