l10n daemon script bb7051dd3a 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"		2019-10-18 05:38:34 +02:00
..
package
animationsmodel.cpp
animationsmodel.h
CMakeLists.txt
desktopsmodel.cpp
desktopsmodel.h
kcm_kwin_virtualdesktops.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-18 05:38:34 +02:00
Messages.sh
virtualdesktops.cpp
virtualdesktops.h