shift-shell/quicksettings/screenrotation
l10n daemon script 98306a6c6e 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-25 01:47:35 +00:00
..
dbus quicksettings/screenrotation: Move C++ out of ShellUtil into package 2022-03-17 00:33:13 -04:00
package SVN_SILENT made messages (.desktop file) - always resolve ours 2022-03-25 01:47:35 +00:00
CMakeLists.txt quicksettings: Ensure package ids don't conflict with existing applets 2022-03-17 15:57:40 -04:00
qmldir quicksettings/screenrotation: Move C++ out of ShellUtil into package 2022-03-17 00:33:13 -04:00
screenrotationplugin.cpp quicksettings/screenrotation: Move C++ out of ShellUtil into package 2022-03-17 00:33:13 -04:00
screenrotationplugin.h quicksettings/screenrotation: Move C++ out of ShellUtil into package 2022-03-17 00:33:13 -04:00
screenrotationutil.cpp quicksettings/screenrotation: Move C++ out of ShellUtil into package 2022-03-17 00:33:13 -04:00
screenrotationutil.h quicksettings/screenrotation: Move C++ out of ShellUtil into package 2022-03-17 00:33:13 -04:00