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

2018-09-03 05:44:49 +02:00

..

activatelattelaunchermenu

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

2018-09-03 05:44:49 +02:00

CMakeLists.txt

fix #916,add kwin script to activate launcher menu

2018-03-10 14:51:41 +02:00