l10n daemon script 2ec68a6148 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"		2021-07-16 01:14:40 +00:00
..
cpp-plasmoid	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-16 01:14:40 +00:00
plasma-wallpaper	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-16 01:14:40 +00:00
plasma-wallpaper-with-qml-extension	Use more target-centric cmake code	2021-07-06 13:58:19 +02:00
qml-plasmoid	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-16 01:14:40 +00:00
qml-plasmoid-with-qml-extension	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-07-16 01:14:40 +00:00
.clang-format	GIT_SILENT Fix formatting for templates	2021-03-13 21:52:20 +01:00
CMakeLists.txt	Add template for Plasma wallpaper with QML extension	2018-04-03 16:38:14 +02:00