l10n daemon script 5a021dc500 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-02 07:56:45 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-02 07:56:45 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-02 07:56:45 +01:00
kwindesktop
kwinoptions
kwinrules	Merge branch 'Plasma/5.12' into Plasma/5.14	2018-10-12 13:54:24 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-20 07:59:53 +02:00
kwinscripts
kwintabbox
CMakeLists.txt