shift-shell/containments
l10n daemon script 1629733d7e 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-06-30 01:45:48 +00:00
..
homescreens SVN_SILENT made messages (.desktop file) - always resolve ours 2022-06-30 01:45:48 +00:00
panel homescreens/halcyon: Two column layout, and refactor 2022-06-28 00:43:40 -04:00
taskpanel homescreen: Don't play zoom animation when going between maximized window states 2022-06-27 16:53:40 -04:00
CMakeLists.txt homescreen: Move into folder 2022-05-17 23:19:11 -04:00