2 commits

Author	SHA1	Message	Date
l10n daemon script	9c0a71c37f	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-13 05:18:09 +02:00
Vlad Zagorodniy	b106579d0f	Move package structure plugins to plugins dir ... Summary: Package structure plugins are not that special so move them to the corresponding directory. Test Plan: Compiles. Reviewers: #kwin Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D18685	2019-03-11 10:57:13 +02:00