l10n daemon script f03b2a4baa 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-10-27 05:56:01 +02:00
..
idletime	[wayland] Fix heap-use-after-free in idle time plugin	2016-02-02 12:00:12 +01:00
kdecorations	Remove unused check	2018-10-25 08:05:13 +02:00
kglobalaccel	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-27 05:56:01 +02:00
qpa	[qpa] Always keep a at least one screen	2018-10-10 11:14:13 +01:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-24 08:15:36 +02:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00