kwin/kcmkwin
l10n daemon script 54b654dcad 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-09-17 06:21:21 +02:00
..
common
kwincompositing SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-17 06:21:21 +02:00
kwindecoration
kwindesktop
kwineffects Fix KNS deprecations 2020-08-28 15:22:17 +02:00
kwinoptions SVN_SILENT made messages (.desktop file) - always resolve ours 2020-09-17 06:21:21 +02:00
kwinrules
kwinscreenedges
kwinscripts Clear plugins after changing KNS entires 2020-08-31 06:35:42 +00:00
kwintabbox kcmkwin/tabbox: Port away from deprecated KTitleWidget::setPixmap() 2020-09-09 13:53:26 +00:00
CMakeLists.txt