l10n daemon script d657448324 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"		2019-08-11 04:57:32 +02:00
..
common
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwindecoration
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-11 04:57:32 +02:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-11 04:57:32 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-07 05:12:10 +02:00
kwintabbox
CMakeLists.txt