Author: l10n daemon script
Revision Date: 2017-12-28 01:09:14 UTC

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"

Author: Christoph Feck
Revision Date: 2013-09-03 12:50:50 UTC

Fix crash in kremotecontrol KCM

Common Qt4 porting regression: current != selected

BUG: 324385
FIXED-IN: 4.11.2