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

2016-04-29 09:46:18 +00:00

..

cpp-plasmoid

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

2016-04-29 09:46:18 +00:00

qml-plasmoid

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

2016-04-29 09:46:18 +00:00

CMakeLists.txt

use the new KDEPackageAppTemplates ECM module

2015-12-29 15:41:35 +01:00