l10n daemon script fddd65deda 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"		2022-12-30 02:09:12 +00:00
..
package/contents/ui
animationsmodel.cpp
animationsmodel.h
CMakeLists.txt
desktopsmodel.cpp
desktopsmodel.h
kcm_kwin_virtualdesktops.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-12-30 02:09:12 +00:00
Messages.sh
virtualdesktops.cpp
virtualdesktops.h
virtualdesktopsdata.cpp
virtualdesktopsdata.h
virtualdesktopssettings.kcfg
virtualdesktopssettings.kcfgc