l10n daemon script 45719a25db 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-24 08:34:15 +01:00
..
common	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-24 08:34:15 +01:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-14 05:39:00 +01:00
kwindesktop	[kcmkwin/kwindesktop] Remove pointless layout container	2019-01-16 15:16:40 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
kwinrules	[kcmkwin/rules] Return absolute path of decoration color scheme	2019-01-14 22:05:04 +02: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