kwin/kcmkwin/kwindesktop
l10n daemon script 866dfb4e89 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"
2021-01-14 07:04:00 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2021-01-14 07:04:00 +01:00
animationsmodel.cpp Add missing includes 2020-11-08 13:36:32 +00:00
animationsmodel.h Prettify license headers 2020-08-07 19:57:56 +00:00
CMakeLists.txt
desktopsmodel.cpp Add emit to signal calls 2020-11-19 22:32:08 +01:00
desktopsmodel.h Prettify license headers 2020-08-07 19:57:56 +00:00
kcm_kwin_virtualdesktops.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2021-01-14 07:04:00 +01:00
Messages.sh
virtualdesktops.cpp Add missing includes 2020-11-08 13:36:32 +00:00
virtualdesktops.h Prettify license headers 2020-08-07 19:57:56 +00:00
virtualdesktopssettings.kcfg
virtualdesktopssettings.kcfgc