kwin/kcmkwin
l10n daemon script 9f3b817bdc 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-19 05:51:04 +01:00
..
common Remove the "Candy" category and fold its contents into "Appearance" 2020-02-25 11:26:27 -07:00
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-02 09:56:27 +01:00
kwindecoration Fix compiler warnings 2020-03-17 15:07:52 +01:00
kwindesktop Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
kwineffects Merge branch 'Plasma/5.18' 2020-02-22 12:02:14 +01:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2020-03-19 05:51:04 +01:00
kwinrules Remove default button on kwinrules KCM 2020-03-16 17:11:01 +01:00
kwinscreenedges Revert "[kcm/effects] Clip ListView" 2020-02-22 11:53:59 +01:00
kwinscripts kcmkwin/scripts: make default button work 2020-03-13 11:08:56 +01:00
kwintabbox Fix compiler warnings 2020-03-17 15:07:52 +01:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03:00