l10n daemon script fcfe48ea6b 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-08-16 08:56:17 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-16 08:56:17 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-10 05:41:19 +02:00
kwindesktop	[kcmkwin/desktop] Use KAboutData::programLogo instead of programIconName	2017-07-31 17:48:59 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-13 04:59:14 +02: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-08-07 04:53:10 +02:00
kwinscripts	Merge branch 'Plasma/5.10'	2017-07-28 12:52:31 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-07 04:53:10 +02:00
CMakeLists.txt