kwin/kcmkwin
l10n daemon script 7fed973dbb 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-05-12 11:06:12 +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 [kcmkwin/kwindecoration] Don't exec() QDialog 2020-05-06 15:15:03 +02:00
kwindesktop
kwineffects SVN_SILENT made messages (.desktop file) - always resolve ours 2020-05-12 11:06:12 +02:00
kwinoptions
kwinrules
kwinscreenedges SVN_SILENT made messages (.desktop file) - always resolve ours 2020-04-29 10:52:05 +02:00
kwinscripts
kwintabbox
CMakeLists.txt