l10n daemon script 429d15941e 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-02-20 06:00:53 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-20 06:00:53 +01:00
kwindecoration	Avoid a crash on Kwin decoration KCM teardown	2017-02-10 10:52:48 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-28 08:15:46 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-20 06:00:53 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-20 06:00:53 +01:00
CMakeLists.txt