Brad Hefta-Gaub 62fc193bff Merge pull request #11532 from sethalves/import-av-entities ... fix importing of avatar entities		2017-10-06 17:59:54 -07:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge pull request #10892 from ctrlaltdavid/vr-edit-a	2017-10-07 02:19:00 +02:00
src	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 11:02:35 -07:00
ui
CMakeLists.txt	New android toolchain	2017-09-19 13:45:12 -07:00
interface.exe.manifest