kwin/kcmkwin
l10n daemon script 3aa9e9ae44 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-01-19 05:43:59 +01:00
..
common
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2020-01-19 05:43:59 +01:00
kwindecoration
kwindesktop
kwineffects
kwinoptions
kwinrules
kwinscreenedges
kwinscripts
kwintabbox
CMakeLists.txt