shift-shell/containments/homescreens
l10n daemon script 9b692c6ef6 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-19 01:47:55 +00:00
..
folio SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-19 01:47:55 +00:00
halcyon homescreens/halcyon: Use reuseItems on app list 2022-09-18 00:00:28 -04:00
CMakeLists.txt homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00