l10n daemon script 91f5938a7f 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-12-24 05:25:01 +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
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-12-24 05:25:01 +01:00
qpa	Bring FindFontconfig.cmake up to ECM standards	2018-12-18 18:11:11 +01:00
scenes	[scenes/opengl] Cleanup cached decoration shadow textures when suspending compositing	2018-12-02 19:59:07 +02:00
CMakeLists.txt