l10n daemon script b07173232b 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-10-31 06:11:50 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-31 06:11:50 +01:00
kwindecoration
kwindesktop	[kcmkwin/kwindesktop] Fix global shortcut's display name for kwin changing	2018-10-30 21:16:20 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-29 08:55:05 +02:00
kwinrules	Merge branch 'Plasma/5.12' into Plasma/5.14	2018-10-12 13:54:24 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-20 06:05:01 +02:00
kwinscripts
kwintabbox	[kcmkwin/kwindesktop] Fix global shortcut's display name for kwin changing	2018-10-30 21:16:20 +00:00
CMakeLists.txt