l10n daemon script dc447860be 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"		2017-04-25 10:05:35 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
qpa	[plugins/qpa] Do not replace a valid FBO with an invalid one	2017-04-22 08:17:33 +02:00
CMakeLists.txt	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00