l10n daemon script 9ad87d3909 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-05-10 07:42:38 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-10 07:42:38 +02:00
kglobalaccel
platforms	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
qpa	Merge branch 'scaling'	2017-04-29 14:11:13 +01:00
CMakeLists.txt	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00