shift-shell/containments/homescreens
l10n daemon script 4ae02a3b9c 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-07-30 01:45:47 +00:00
..
default SVN_SILENT made messages (.desktop file) - always resolve ours 2022-07-30 01:45:47 +00:00
halcyon SVN_SILENT made messages (.desktop file) - always resolve ours 2022-07-30 01:45:47 +00:00
CMakeLists.txt homescreens/halcyon: Add new homescreen 2022-06-08 18:09:35 -04:00