shift-shell/quicksettings
l10n daemon script c57b024e4d SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2022-02-15 01:48:28 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-14 01:43:34 +00:00
caffeine SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-15 01:48:28 +00:00
nightcolor SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-14 01:43:34 +00:00
powermenu SVN_SILENT made messages (.desktop file) - always resolve ours 2022-02-15 01:48:28 +00:00
CMakeLists.txt quicksettings: Add power menu quicksetting 2022-02-11 00:20:47 -05:00