kwin/kcmkwin/kwindesktop
l10n daemon script b07ba3baa3 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"
2018-12-19 05:50:20 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-19 05:50:20 +01:00
CMakeLists.txt [kcmkwin/desktop] KCM using new virtual desktops DBus interface 2018-12-18 16:42:19 +09:00
desktopsmodel.cpp [kcmkwin/desktop] KCM using new virtual desktops DBus interface 2018-12-18 16:42:19 +09:00
desktopsmodel.h [kcmkwin/desktop] KCM using new virtual desktops DBus interface 2018-12-18 16:42:19 +09:00
kcm_kwin_virtualdesktops.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-12-19 05:50:20 +01:00
Messages.sh [kcmkwin/desktop] KCM using new virtual desktops DBus interface 2018-12-18 16:42:19 +09:00
virtualdesktops.cpp [kcmkwin/desktop] KCM using new virtual desktops DBus interface 2018-12-18 16:42:19 +09:00
virtualdesktops.h [kcmkwin/desktop] KCM using new virtual desktops DBus interface 2018-12-18 16:42:19 +09:00