l10n daemon script c8e6d3f09a 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"		2017-07-03 04:22:04 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-25 04:33:13 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 04:29:59 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-11 04:45:20 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 06:02:34 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 06:02:34 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-03 04:22:04 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-25 04:33:13 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-25 04:33:13 +02:00
CMakeLists.txt