shift-shell/quicksettings/record
l10n daemon script 68dfdefbda 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-10-20 02:06:33 +00:00
..
package/contents SVN_SILENT made messages (.desktop file) - always resolve ours 2022-10-20 02:06:33 +00:00
CMakeLists.txt quicksettings/record: Move record functions out of shellutil 2022-10-12 12:00:12 -04:00
qmldir quicksettings/record: Move record functions out of shellutil 2022-10-12 12:00:12 -04:00
recordplugin.cpp quicksettings/record: Move record functions out of shellutil 2022-10-12 12:00:12 -04:00
recordplugin.h quicksettings/record: Move record functions out of shellutil 2022-10-12 12:00:12 -04:00
recordutil.cpp quicksettings/record: Fix 2022-10-12 12:06:11 -04:00
recordutil.h quicksettings/record: Fix 2022-10-12 12:06:11 -04:00