Seth Alves 2a43c41954 Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking		2017-04-03 14:44:13 -07:00
..
external
i18n
icon
resources	Merge pull request #10080 from ZappoMan/footActions	2017-04-03 12:06:14 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into fix-fast-talking	2017-04-03 14:44:13 -07:00
ui
CMakeLists.txt
interface.exe.manifest