l10n daemon script fcdc3e5a2c 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"		2016-11-04 09:48:38 +00:00
..
idletime	[wayland] Fix heap-use-after-free in idle time plugin	2016-02-02 12:00:12 +01:00
kdecorations	[decorations/aurorae] Fix typo in Plastik theme	2016-10-29 20:38:42 +02:00
kglobalaccel	[globalaccel] Ensure we don't call into deleted InputRedirection on shutdown	2015-10-05 14:47:15 +02:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-04 09:48:38 +00:00
qpa	[plugins/qpa] support use of modularized qtplatformsupport from Qt 5.8	2016-10-28 21:12:48 +09:00
CMakeLists.txt	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00