l10n daemon script 145bfd168d 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-10-28 04:38:13 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
kglobalaccel
platforms	Merge branch 'Plasma/5.11'	2017-10-26 01:07:49 +01:00
qpa	[QPA] Implement Screen on top of internal Screens API	2017-10-19 18:03:10 +02:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-28 04:38:13 +02:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00