l10n daemon script 655f184a61 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"		2018-01-07 05:00:26 +01:00
..
idletime	[wayland] Fix heap-use-after-free in idle time plugin	2016-02-02 12:00:12 +01:00
kdecorations	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
kglobalaccel	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
platforms	[libinput] Find screen for touch screen devices and calibrate accordingly	2017-12-23 10:18:55 +01:00
qpa	Require Qt 5.9	2017-10-31 12:45:21 +01:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-07 05:00:26 +01:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00