David Rowe 6a00834147 Merge branch 'master' into M21128 ... # Conflicts: # interface/src/AboutUtil.h		2019-02-15 08:06:41 +13:00
..
compiledResources
external
i18n
icon	New icons for interface and server-console	2019-01-11 14:50:13 -08:00
resources	Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix	2019-02-12 15:02:28 -08:00
src	Merge branch 'master' into M21128	2019-02-15 08:06:41 +13:00
ui
CMakeLists.txt	Support custom display / input plugin lists and small tweaks	2019-02-07 15:15:26 -08:00
interface.exe.manifest