l10n daemon script d8addb6b3a 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"		2018-06-18 07:25:30 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02:00
kglobalaccel	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
platforms	Merge branch 'Plasma/5.12' into Plasma/5.13	2018-05-20 15:41:48 +02:00
qpa	Request a high-priority EGL contexts	2018-03-29 20:34:22 +09:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-13 07:33:20 +02:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00