Zach Fox 81264c998b Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.		2017-03-28 17:39:45 -07:00
..
external
i18n
icon
resources	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
src	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -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