shift-shell/containments
l10n daemon script a15475b8f3 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-09-14 01:45:56 +00:00
..
homescreens SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-14 01:45:56 +00:00
panel SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-11 01:44:12 +00:00
taskpanel taskpanel: Remove keyboard button setting, only show when unsupported 2022-09-12 08:12:24 -04:00
CMakeLists.txt homescreen: Move into folder 2022-05-17 23:19:11 -04:00