l10n daemon script 9c0a71c37f 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-07-13 05:18:09 +02:00
..
idletime
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
kglobalaccel
kpackage	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-13 05:18:09 +02:00
platforms	drm: Save scaling and position of displays at shutdown	2019-07-10 21:01:46 +02:00
qpa	[plugins/qpa] Return a fixed value logicalDpi	2019-07-02 22:32:39 +03:00
scenes	Port away from deprecated QImage::byteCount	2019-07-10 02:02:15 +03:00
windowsystem
CMakeLists.txt	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00