l10n daemon script eda7a3d969 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-29 05:22:48 +02:00
..
cpp-plasmoid	Consistently use X-KDE-ServiceTypes instead of ServiceTypes	2018-03-24 00:44:26 +01:00
plasma-wallpaper	Wallpaper templates: set background color to ensure contrast to sample text content	2018-04-04 14:39:18 +02:00
plasma-wallpaper-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-04-29 05:22:48 +02:00
qml-plasmoid	Templates: drop unused X-Plasma-DefaultSize from applet metadata	2018-03-24 00:54:53 +01:00
qml-plasmoid-with-qml-extension	Templates: drop unused X-Plasma-DefaultSize from applet metadata	2018-03-24 00:54:53 +01:00
CMakeLists.txt	Add template for Plasma wallpaper with QML extension	2018-04-03 16:38:14 +02:00