l10n daemon script ccc69e8105 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-07-26 08:52:42 +02: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	2017-07-26 08:52:42 +02:00
kglobalaccel	[globalaccel] Ensure we don't call into deleted InputRedirection on shutdown	2015-10-05 14:47:15 +02:00
platforms	Hide the Linux specific parts behind check for headers	2017-07-24 16:19:27 +02:00
qpa	[qpa] Use the new OpenGLContextAttributeBuilder to create Qt's OpenGL context	2017-07-17 16:53:37 +02:00
CMakeLists.txt	Move clients/ to plugins/kdecorations/	2016-04-15 15:21:03 +02:00