l10n daemon script 1112188a8b 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-06-10 05:41:19 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 05:41:19 +02:00
kglobalaccel
platforms	[DRM plugin] No forward declare of DrmSurfaceBuffer without GBM	2017-05-11 23:53:24 +02:00
qpa	Merge branch 'scaling'	2017-04-29 14:11:13 +01:00
CMakeLists.txt