shift-shell/quicksettings
l10n daemon script 03f3411c9a 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-04-05 01:49:56 +00:00
..
airplanemode SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-03 01:57:17 +00:00
audio SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
battery SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
bluetooth SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
caffeine
flashlight SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
keyboardtoggle
location SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
mobiledata SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
nightcolor
powermenu
screenrotation SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
screenshot SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
settingsapp SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
wifi SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-05 01:49:56 +00:00
CMakeLists.txt