Commit graph

2 commits

Author SHA1 Message Date
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
Eike Hein
cee5ea7819 [kcmkwin/desktop] KCM using new virtual desktops DBus interface
Summary:
A rewrite of the Virtual Desktops KCM using the new DBus
API.

Depends on D13887.

Reviewers: mart, davidedmundson, ltoscano, zzag

Subscribers: davidedmundson, broulik, plasma-devel, kwin

Tags: #kwin

Maniphest Tasks: T4457

Differential Revision: https://phabricator.kde.org/D14542
2018-12-18 16:42:19 +09:00
Renamed from kcmkwin/kwindesktop/desktop.desktop (Browse further)