l10n daemon script d82a27d395 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"		2019-05-01 05:58:07 +02:00
..
cpp-plasmoid	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-05-01 05:58:07 +02:00
plasma-wallpaper	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-29 05:32:51 +01:00
plasma-wallpaper-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-29 05:32:51 +01:00
qml-plasmoid	Use more https in links (& update a few urls)	2019-01-19 16:36:59 +01:00
qml-plasmoid-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-29 05:32:51 +01:00
CMakeLists.txt	Add template for Plasma wallpaper with QML extension	2018-04-03 16:38:14 +02:00