64786630a5
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" |
||
---|---|---|
.. | ||
package | ||
animationsmodel.cpp | ||
animationsmodel.h | ||
CMakeLists.txt | ||
desktopsmodel.cpp | ||
desktopsmodel.h | ||
kcm_kwin_virtualdesktops.desktop | ||
Messages.sh | ||
virtualdesktops.cpp | ||
virtualdesktops.h | ||
virtualdesktopssettings.kcfg | ||
virtualdesktopssettings.kcfgc |