John Conklin II 02d0c7d795 Merge pull request #13454 from danteruiz/mac-fix-general-settings ... make general settings be under settings instead of preferences		2018-06-27 15:59:16 -07:00
..
compiledResources
external
i18n
icon
resources	fix login links	2018-06-26 10:20:22 -07:00
src	Merge pull request #13454 from danteruiz/mac-fix-general-settings	2018-06-27 15:59:16 -07:00
ui
CMakeLists.txt	merge 'master' into 'workload'	2018-06-18 13:40:08 -07:00
interface.exe.manifest