l10n daemon script 1a6662e796 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-11-06 04:38:04 +01: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-11-06 04:38:04 +01:00
kglobalaccel	[globalaccel] Ensure we don't call into deleted InputRedirection on shutdown	2015-10-05 14:47:15 +02:00
platforms	Merge branch 'Plasma/5.11'	2017-11-05 10:46:53 +01:00
qpa	Require Qt 5.9	2017-10-31 12:45:21 +01:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-04 06:13:10 +01:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00