l10n daemon script d966302de7 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-04-11 09:44:49 +02:00
..
kwincompositing	Merge branch 'Plasma/5.9'	2017-04-04 19:38:58 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 06:02:34 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 06:02:34 +01: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-04-11 09:44:49 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-28 13:54:29 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-28 13:54:29 +02:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00