l10n daemon script c7455c7177 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-17 07:34:47 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-17 07:34:47 +02:00
kwindecoration	Fix minor EBN issues	2018-08-29 21:02:16 +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-08-30 05:51:44 +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-09-08 06:16:40 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-08 06:16:40 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-27 05:52:15 +02:00
CMakeLists.txt