kwin/kcmkwin/kwindesktop
l10n daemon script 9799456f3b 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-12-09 06:48:24 +01:00
..
package Fix Connections warnings 2020-11-11 19:22:40 +00:00
animationsmodel.cpp
animationsmodel.h
CMakeLists.txt
desktopsmodel.cpp Add emit to signal calls 2020-11-19 22:32:08 +01:00
desktopsmodel.h
kcm_kwin_virtualdesktops.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-12-09 06:48:24 +01:00
Messages.sh
virtualdesktops.cpp
virtualdesktops.h
virtualdesktopssettings.kcfg
virtualdesktopssettings.kcfgc