Olivier Prat 8229c41622 Merge branch 'master' of git://github.com/highfidelity/hifi into outline		2017-10-20 09:59:07 +02:00
..
external
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 branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-19 17:38:05 +02:00
ui
CMakeLists.txt	Prototype packaging QML and related resources into a QRC	2017-10-14 14:40:46 -07:00
interface.exe.manifest