430ca2a33e
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" |
||
|---|---|---|
| .. | ||
| thumbnails | ||
| CMakeLists.txt | ||
| kwinpluginssettings.kcfg | ||
| kwinpluginssettings.kcfgc | ||
| kwinswitcheffectsettings.kcfg | ||
| kwinswitcheffectsettings.kcfgc | ||
| kwinswitcher.knsrc | ||
| kwintabbox.desktop | ||
| kwintabboxconfigform.cpp | ||
| kwintabboxconfigform.h | ||
| kwintabboxsettings.kcfg | ||
| kwintabboxsettings.kcfgc | ||
| layoutpreview.cpp | ||
| layoutpreview.h | ||
| main.cpp | ||
| main.h | ||
| main.ui | ||
| Messages.sh | ||
| thumbnailitem.cpp | ||
| thumbnailitem.h | ||