shift-shell/containments/homescreens/folio
l10n daemon script fd5eb22a09 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-25 01:47:37 +00:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-25 01:47:37 +00:00
applicationlistmodel.cpp homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
applicationlistmodel.h homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
CMakeLists.txt homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
desktopmodel.cpp homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
desktopmodel.h homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
homescreen.cpp homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
homescreen.h homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00
Messages.sh homescreens/folio: Rename from default 2022-09-11 20:01:23 -04:00