l10n daemon script 226edf8b03 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-09-28 11:55:23 +00:00
..
idletime	[wayland] Fix heap-use-after-free in idle time plugin	2016-02-02 12:00:12 +01:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-24 12:33:32 +00:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-28 11:55:23 +00:00
qpa	[plugins/qpa] Call makeCurrent on the QOpenGLContext instead of the one in the platform context	2016-08-26 07:38:04 +02:00
CMakeLists.txt	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00