RebeccaStankus 720f186bd7 Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter		2017-12-22 13:47:42 -08: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 log-filter	2017-12-22 13:47:42 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter	2017-12-22 13:47:42 -08:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
interface.exe.manifest