kwin/kcmkwin
l10n daemon script 4559d3a2d8 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-02 09:56:27 +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-02 09:56:27 +01:00
kwindecoration Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01: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 Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +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