plasma-framework/templates
l10n daemon script f6bb0229b0 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"
2020-03-27 06:24:35 +01:00
..
cpp-plasmoid templates: Convert license statements to SPDX headers 2020-02-29 13:25:01 +01:00
plasma-wallpaper templates: Convert license statements to SPDX headers 2020-02-29 13:25:01 +01:00
plasma-wallpaper-with-qml-extension SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-27 06:24:35 +01:00
qml-plasmoid templates: Convert license statements to SPDX headers 2020-02-29 13:25:01 +01:00
qml-plasmoid-with-qml-extension templates: Convert license statements to SPDX headers 2020-02-29 13:25:01 +01:00
CMakeLists.txt Add template for Plasma wallpaper with QML extension 2018-04-03 16:38:14 +02:00