l10n daemon script 71f9e6b85a 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-09-15 08:34:59 +02:00

..

CMakeLists.txt

more improvements to containmentactions

2018-02-03 21:56:05 +02:00

menu.cpp

Improve Contextmenu

2019-02-13 19:47:08 +02:00

menu.h

support to send the viewType through dbus

2019-02-12 20:53:14 +02:00

Messages.sh

add containmentactions

2018-02-03 20:56:30 +02:00

plasma-containmentactions-lattecontextmenu.desktop

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

2019-09-15 08:34:59 +02:00