shift-shell/containments
l10n daemon script 9d284e4aa1 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"
2025-04-15 01:29:59 +00:00
..
homescreens folio: Delete delegates if the application is removed 2025-03-19 23:40:11 -04:00
panel GestureNavigation: Fix Action Drawer State being out of Sync on First Start 2025-04-13 12:55:25 +00:00
taskpanel SVN_SILENT made messages (.desktop file) - always resolve ours 2025-04-15 01:29:59 +00:00
CMakeLists.txt homescreen: Move into folder 2022-05-17 23:19:11 -04:00