l10n daemon script dc3aaddeeb 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-06-07 05:42:59 +02:00
..
cpp-plasmoid	Templates: consistent naming, fix translation catalog names & more	2018-05-21 14:08:04 +02:00
plasma-wallpaper	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-03 05:23:03 +02:00
plasma-wallpaper-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-07 05:42:59 +02:00
qml-plasmoid	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-03 05:23:03 +02:00
qml-plasmoid-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-07 05:42:59 +02:00
CMakeLists.txt	Add template for Plasma wallpaper with QML extension	2018-04-03 16:38:14 +02:00