2 Commits

Author	SHA1	Message	Date
l10n daemon script	af47edce54	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"	2018-04-04 05:20:09 +02:00
Friedrich W. H. Kossebau	354bd71296	Add template for Plasma wallpaper with QML extension ... Summary: Allows to quickly start a new wallpaper which also wants to use a custom QML extension. Reviewers: mart Reviewed By: mart Subscribers: #frameworks Tags: #frameworks Differential Revision: https://phabricator.kde.org/D10849	2018-04-03 16:38:14 +02:00