3 Commits

Author SHA1 Message Date
l10n daemon script
781d2f6fff 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"
2019-07-31 05:13:30 +02:00
l10n daemon script
875dbab70c 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"
2019-07-06 05:15:02 +02:00
Friedrich W. H. Kossebau
eff37abdcb Automatically set version of desktopthemes packages to KF5_VERSION
Summary:
Should ensure that on a new release any existing theme caches are updated
automatically.

Reviewers: #plasma, ltoscano, apol

Reviewed By: apol

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D21767
2019-06-13 15:38:23 +02:00