shift-shell/quicksettings/screenshot
l10n daemon script c2474b385e 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-03-19 01:43:02 +00:00
..
dbus quicksettings/screenshot: Move C++ out of ShellUtil into package 2022-03-16 23:49:51 -04:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-19 01:43:02 +00:00
CMakeLists.txt quicksettings: Ensure package ids don't conflict with existing applets 2022-03-17 15:57:40 -04:00
qmldir quicksettings/screenshot: Move C++ out of ShellUtil into package 2022-03-16 23:49:51 -04:00
screenshotplugin.cpp quicksettings/flashlight: Move C++ out of ShellUtil into package 2022-03-17 00:07:29 -04:00
screenshotplugin.h quicksettings/screenshot: Move C++ out of ShellUtil into package 2022-03-16 23:49:51 -04:00
screenshotutil.cpp quicksettings/screenshot: Move C++ out of ShellUtil into package 2022-03-16 23:49:51 -04:00
screenshotutil.h quicksettings/screenshot: Move C++ out of ShellUtil into package 2022-03-16 23:49:51 -04:00