l10n daemon script c85a2227b7 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"		2019-10-23 09:29:41 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
kglobalaccel
platforms	[platforms/x11] Force glXSwapBuffers to block with NVIDIA driver	2019-03-27 10:26:21 +02:00
qpa
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-24 08:42:22 +02:00
CMakeLists.txt