Dante Ruiz c4253f3b3b Merge branch 'master' of github.com:highfidelity/hifi into soft-entities		2018-01-09 15:31:38 -08:00
..
external
i18n
icon
resources	Merge pull request #12109 from vladest/tablet_page_indicator	2018-01-09 14:05:32 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into soft-entities	2018-01-09 15:31:38 -08:00
ui
CMakeLists.txt	Merge pull request #12100 from samcake/blue	2018-01-08 17:41:34 -08:00
interface.exe.manifest