alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
29104614ef
plasma-framework/templates
History
l10n daemon script 29104614ef 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"
2019-11-01 05:25:32 +01:00
..
cpp-plasmoid SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-01 05:25:32 +01:00
plasma-wallpaper SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-01 05:25:32 +01:00
plasma-wallpaper-with-qml-extension SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-01 05:25:32 +01:00
qml-plasmoid SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-01 05:25:32 +01:00
qml-plasmoid-with-qml-extension SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-01 05:25:32 +01:00
CMakeLists.txt Add template for Plasma wallpaper with QML extension 2018-04-03 16:38:14 +02:00