2 Commits

Author	SHA1	Message	Date
l10n daemon script	7a4ef77ac8	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-05-20 04:16:47 +02:00
Friedrich W. H. Kossebau	4d5793c28a	Add template for Plasma QML Applet with QML extension ... Summary: Should help people to kick-off plasmoids which also use custom QML classes. Test Plan: Created new plasmoid from template using kdevelop. Reviewers: #plasma, mart Reviewed By: mart Subscribers: plasma-devel, #frameworks Tags: #plasma, #frameworks Differential Revision: https://phabricator.kde.org/D5914	2017-05-19 14:23:13 +02:00