Seth Alves 511f94a4fc Merge branch 'master' of github.com:highfidelity/hifi into run		2018-01-16 14:01:54 -08:00
..
external
i18n
icon
resources	Merge pull request #12182 from highfidelity/stable	2018-01-16 11:01:07 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into run	2018-01-16 14:01:54 -08:00
ui
CMakeLists.txt	Merge pull request #12100 from samcake/blue	2018-01-08 17:41:34 -08:00
interface.exe.manifest