l10n daemon script ba0b34c755 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-11-22 06:02:11 +01:00
..
idletime	Build KF5IdleTimeKWinWaylandPrivatePlugin in correct directory	2018-11-09 17:39:29 +01:00
kdecorations	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kglobalaccel	[autotests] Support new way to run the tests without need to install	2017-11-21 20:34:52 +01:00
platforms	Add output orientation size helper	2018-11-14 20:05:39 +01:00
qpa	Remove unused private Qt include	2018-11-04 17:02:19 +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