l10n daemon script ae5df024b1 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"		2016-12-02 05:50:58 +01:00
..
idletime
kdecorations	[decorations/aurorae] Fix typo in Plastik theme	2016-10-29 20:38:42 +02:00
kglobalaccel
platforms	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-02 05:50:58 +01:00
qpa	[plugins/qpa] Properly clean up the created KWayland::Client::Outputs	2016-10-28 10:12:15 +02:00
CMakeLists.txt