l10n daemon script 51e30d541d 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-08-17 05:55:32 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-17 05:55:32 +02:00
kwindecoration	Merge branch 'Plasma/5.13'	2018-08-15 11:34:19 +03:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 07:12:23 +02:00
CMakeLists.txt