l10n daemon script 5a7d6d3df9 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-08-28 04:30:46 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
kglobalaccel
platforms	Move updateXTime into the X11 standalone platform	2017-08-24 20:49:49 +02:00
qpa	[plugins/qpa] Drop unused variable AbstractPlatformContext::m_integration	2017-07-31 18:09:15 +02:00
CMakeLists.txt