Seth Alves 7c2957cfa7 merge from upstream		2017-01-31 08:57:36 -08:00
..
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-31 05:02:07 -08:00
src	merge from upstream	2017-01-31 08:57:36 -08:00
ui
CMakeLists.txt
interface.exe.manifest