l10n daemon script edccfd44bc 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"

2017-06-02 04:26:47 +02:00

..

cpp-plasmoid

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-05-24 08:46:29 +02:00

plasma-wallpaper

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-05-24 08:46:29 +02:00

qml-plasmoid

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-05-24 08:46:29 +02:00

qml-plasmoid-with-qml-extension

SVN_SILENT made messages (.desktop file) - always resolve ours

2017-06-02 04:26:47 +02:00

CMakeLists.txt

Add template for Plasma QML Applet with QML extension

2017-05-19 14:23:13 +02:00