Howard Stearns 9a04fdf10a Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds		2015-06-26 16:24:27 -07:00
..
external
icon
resources	Merge pull request #5214 from venkatn93/master	2015-06-26 18:27:59 -04:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds	2015-06-26 16:24:27 -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