kwin/kcmkwin
l10n daemon script f18109d9c4 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-03-26 10:48:29 +01:00
..
common Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-26 10:48:29 +01:00
kwindecoration Notify about decorations button order change 2020-03-07 15:19:24 +03:00
kwindesktop Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01: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 Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
kwinscreenedges Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
kwinscripts
kwintabbox Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
CMakeLists.txt