mirror of
https://invent.kde.org/plasma/plasma-desktop.git
synced 2026-11-03 14:49:44 -09:00
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" |
||
|---|---|---|
| .. | ||
| schemes | ||
| ui | ||
| basemodel.cpp | ||
| basemodel.h | ||
| CMakeLists.txt | ||
| filteredmodel.cpp | ||
| filteredmodel.h | ||
| globalaccelmodel.cpp | ||
| globalaccelmodel.h | ||
| kcm_keys.cpp | ||
| kcm_keys.h | ||
| kcm_keys.json | ||
| keysdata.cpp | ||
| keysdata.h | ||
| Messages.sh | ||
| shortcutsmodel.cpp | ||
| shortcutsmodel.h | ||
| standardshortcutsmodel.cpp | ||
| standardshortcutsmodel.h | ||