l10n daemon script 1879303d5b 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-06-19 06:02:57 +02:00
..
idletime	[wayland] Fix heap-use-after-free in idle time plugin	2016-02-02 12:00:12 +01:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02:00
kglobalaccel	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
platforms	Set specific edge cursor shape when resizing	2018-06-11 10:05:07 +01:00
qpa	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
scenes	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-19 06:02:57 +02:00
CMakeLists.txt	Move SceneXRender into a plugin	2017-09-01 17:42:28 +02:00