l10n daemon script 09de9c13df 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"

2021-05-15 01:19:32 +00:00

..

package

SVN_SILENT made messages (.desktop file) - always resolve ours

2021-05-15 01:19:32 +00:00

plugin

containment:enable startUp flag from layout manager

2021-05-05 22:27:30 +03:00

CMakeLists.txt

provide FastLayoutManager save() function

2021-03-05 12:55:41 +02:00

Messages.sh

use kde translations infrastructure

2017-09-08 12:02:52 +03:00

metadata.desktop.cmake

SVN_SILENT made messages (.desktop file) - always resolve ours

2021-05-15 01:19:32 +00:00