l10n daemon script f28ba7cba6 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-22 04:11:37 +02:00
..
cpp-plasmoid	Plasmoid templates: use the image which is part of the package (again)	2017-05-19 14:37:20 +02:00
plasma-wallpaper	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-14 03:57:03 +02:00
qml-plasmoid	Plasmoid templates: use the image which is part of the package (again)	2017-05-19 14:37:20 +02:00
qml-plasmoid-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-22 04:11:37 +02:00
CMakeLists.txt	Add template for Plasma QML Applet with QML extension	2017-05-19 14:23:13 +02:00