Commit graph

52 commits

Author SHA1 Message Date
l10n daemon script
871a69824f 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-15 01:50:20 +00:00
Devin Lin
8c885bc699 quicksettings/record: Move record functions out of shellutil 2022-10-12 12:00:12 -04:00