plasma-framework/templates
l10n daemon script 05e86467c4 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"
2016-10-17 09:30:20 +00:00
..
cpp-plasmoid SVN_SILENT made messages (.desktop file) - always resolve ours 2016-10-17 09:30:20 +00:00
plasma-wallpaper SVN_SILENT made messages (.desktop file) - always resolve ours 2016-10-17 09:30:20 +00:00
qml-plasmoid SVN_SILENT made messages (.desktop file) - always resolve ours 2016-10-17 09:30:20 +00:00
CMakeLists.txt Add a kapptemplate for Plasma Wallpaper 2016-08-05 16:02:14 +02:00