l10n daemon script f579dc339c 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"		2020-04-29 10:52:05 +02:00
..
common	[kcmkwin] Make dialog non blocking	2020-04-07 09:27:31 +01:00
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-01 11:06:32 +02:00
kwindecoration	Notify about decorations button order change	2020-03-07 15:19:24 +03:00
kwindesktop	[kcmkwin/kwindesktop] Fix inability to create more than one row on the "Virtual Desktops" settings page	2020-03-29 18:15:05 -06:00
kwineffects	[kcm/effects] Clip ListView	2020-02-22 12:01:19 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-21 09:55:15 +01:00
kwinrules
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-04-29 10:52:05 +02:00
kwinscripts
kwintabbox
CMakeLists.txt