alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
793441b77b
plasma-framework/templates
History
l10n daemon script 793441b77b 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-12-20 12:53:44 +01:00
..
cpp-plasmoid SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
plasma-wallpaper SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
qml-plasmoid SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 12:53:44 +01:00
CMakeLists.txt Add a kapptemplate for Plasma Wallpaper 2016-08-05 16:02:14 +02:00