Andrew Meadows 5a388a0c14 Merge pull request #4722 from birarda/avatar-mixer-debug ... add option to display AvatarData receive stats with display name		2015-04-29 10:00:24 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Importing peferred dialog look from browser branch	2015-04-28 00:26:24 -07:00
src	Merge pull request #4722 from birarda/avatar-mixer-debug	2015-04-29 10:00:24 -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	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in