David Rowe 7236ac17e2 Merge branch 'master' into 21661		2018-01-04 15:21:00 +13:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Fix Security Pic Change dialog after QML security changes	2018-01-03 11:28:39 -08:00
src	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13: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