Howard Stearns 51782bd17d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds		2015-06-29 09:30:44 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	handle conflicts on merge with upstream master	2015-06-26 15:33:35 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds	2015-06-29 09:30:44 -07:00
ui	Avatar collision sounds.	2015-06-26 16:23:16 -07:00
CMakeLists.txt	Code Review changes	2015-06-10 14:35:52 -06:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in