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

2015-12-30 09:28:22 +00:00

..

dialogs

get rid of shutdowndialog

2014-06-13 12:28:15 +02:00

opaque

panels have bottom margin

2015-04-07 21:31:47 +02:00

widgets

panels have bottom margin

2015-04-07 21:31:47 +02:00

CMakeLists.txt

Install all plasma files in a prefix/share/plasma directory

2014-04-27 17:14:22 +02:00

colors

use view color for text in textfield

2014-05-22 11:42:20 +02:00

metadata.desktop

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

2015-12-30 09:28:22 +00:00