l10n daemon script a839dadf9b 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-09-08 08:44:29 +02:00
..
kwincompositing	[kcmkwin] Use QtQuick.Controls 2.0 for Label and TextField	2018-08-15 11:31:00 +03:00
kwindecoration	[kcmkwin] Use QtQuick.Controls 2.0 for Label and TextField	2018-08-15 11:31:00 +03:00
kwindesktop
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 08:44:29 +02:00
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 08:44:29 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 08:44:29 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-26 08:08:30 +02:00
CMakeLists.txt