Seth Alves 96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3		2017-12-22 15:13:02 -08:00
..
external
i18n
icon
resources	Merge pull request #12047 from zfox23/commerce_dataTracking3	2017-12-22 14:31:03 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
ui
CMakeLists.txt	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
interface.exe.manifest