Seth Alves 43e1cec8a3 merge from upstream		2017-04-03 06:28:59 -07:00
..
external
i18n
icon
resources	Merge pull request #10095 from druiz17/tablet-webView2.0	2017-04-01 08:33:09 -07:00
src	merge from upstream	2017-04-03 06:28:59 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
interface.exe.manifest