Zach Fox aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2		2017-10-19 10:54:31 -07:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
src	Merge pull request #11591 from ctrlaltdavid/21568	2017-10-18 22:07:06 -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