l10n daemon script b7f6e57eff 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"		2019-01-14 05:39:00 +01:00
..
common	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
kwincompositing	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-14 05:39:00 +01:00
kwindesktop	[kcmkwin/desktop] Add animation option back	2019-01-08 15:49:36 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
kwinrules	Port window specific rules dialog to DBus	2018-12-31 07:58:12 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
CMakeLists.txt	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00