Seth Alves 08af1b2894 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3		2017-12-15 11:25:01 -08:00
..
external
i18n
icon
resources	8992 Login window is small in tablet	2017-12-14 23:53:33 +00:00
src	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-15 11:25:01 -08:00
ui
CMakeLists.txt	Merge pull request #11612 from highfidelity/pointers	2017-10-20 13:53:52 -07:00
interface.exe.manifest