2 commits

Author	SHA1	Message	Date
l10n daemon script	12a02451df	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"	2017-03-17 03:50:12 +01:00
Marco Martin	898bee614d	add packagestructure for KWin/Decoration ... Summary: use a KPackage/PackageStructure for aurorae themes as well Patch by Demitrius Belai Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, plasma-devel, kwin, #kwin Tags: #plasma Differential Revision: https://phabricator.kde.org/D4974	2017-03-15 13:09:34 +01:00