Thijs Wenker e94199acad Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName		2017-11-20 18:29:54 +01:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge pull request #11793 from ElderOrb/FB9032	2017-11-19 11:25:35 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
ui
CMakeLists.txt	Merge pull request #11612 from highfidelity/pointers	2017-10-20 13:53:52 -07:00
interface.exe.manifest