l10n daemon script c85a2227b7 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-10-23 09:29:41 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-31 09:35:16 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-20 09:22:28 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-26 09:24:52 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-23 09:29:41 +02:00
CMakeLists.txt