l10n daemon script 3e09342c5e 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-02-12 05:48:29 +01:00
..
common	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00
kwincompositing	[kcmkwin/compositing] Delete unused config headers	2019-02-08 17:27:25 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-02-12 05:48:29 +01:00
kwindesktop	[kcmkwin] Use new icons for virtual desktops, touch screen, and screen edges KCMs	2019-01-24 14:42:33 -07:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-01-06 05:42:41 +01:00
kwinrules	[kcmkwin/rules] Fix line separators in the dialog	2019-01-30 15:56:28 +02:00
kwinscreenedges	[kcmkwin] Use new icons for virtual desktops, touch screen, and screen edges KCMs	2019-01-24 14:42:33 -07: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	2019-02-06 05:46:34 +01:00
CMakeLists.txt	[kcmkwin] Move effects model into a shared library	2019-01-08 15:49:20 +02:00