l10n daemon script 0990566c63 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-05-31 11:06:54 +00:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-05-31 11:06:54 +00:00
kglobalaccel
platforms	[platforms/drm] Only show cursor if a pointer device is available	2016-05-25 12:14:00 +02:00
qpa	[plugins/qpa] Add support for QT_WAYLAND_FORCE_DPI env variable	2016-05-17 07:32:30 +02:00
CMakeLists.txt