c10fe06d06
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" |
||
|---|---|---|
| .. | ||
| clientmodel.cpp | ||
| clientmodel.h | ||
| CMakeLists.txt | ||
| desktopchain.cpp | ||
| desktopchain.h | ||
| desktopmodel.cpp | ||
| desktopmodel.h | ||
| kwindesktopswitcher.desktop | ||
| kwinwindowswitcher.desktop | ||
| switcheritem.cpp | ||
| switcheritem.h | ||
| tabbox.cpp | ||
| tabbox.h | ||
| tabbox_logging.cpp | ||
| tabbox_logging.h | ||
| tabboxconfig.cpp | ||
| tabboxconfig.h | ||
| tabboxhandler.cpp | ||
| tabboxhandler.h | ||
| x11_filter.cpp | ||
| x11_filter.h | ||