l10n daemon script 0137317ee9 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-05-08 08:48:24 +02:00

..

CMakeLists.txt

more improvements to containmentactions

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

menu.cpp

enable Layouts menu after hiding it

2018-02-12 23:54:34 +02:00

menu.h

update code to new astyle conditions

2018-07-03 22:15:45 +03: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-05-08 08:48:24 +02:00