Zach Fox c0ab320da6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster		2017-10-20 10:40:35 -07:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge pull request #11635 from druiz17/fix-hud-issues	2017-10-20 10:22:34 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Prototype packaging QML and related resources into a QRC	2017-10-14 14:40:46 -07:00
interface.exe.manifest