l10n daemon script 1f76c005e9 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"		2016-09-24 12:33:32 +00:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-24 12:33:32 +00:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
qpa	[plugins/qpa] Call makeCurrent on the QOpenGLContext instead of the one in the platform context	2016-08-26 07:38:04 +02:00
CMakeLists.txt