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" |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| kwinscreenedge.cpp | ||
| kwinscreenedge.h | ||
| kwinscreenedgeconfigform.cpp | ||
| kwinscreenedgeconfigform.h | ||
| kwinscreenedges.desktop | ||
| kwinscreenedgescriptsettings.kcfg | ||
| kwinscreenedgescriptsettings.kcfgc | ||
| kwinscreenedgesettings.kcfg | ||
| kwinscreenedgesettings.kcfgc | ||
| kwintouchscreen.desktop | ||
| kwintouchscreenedgeconfigform.cpp | ||
| kwintouchscreenedgeconfigform.h | ||
| kwintouchscreenscriptsettings.kcfg | ||
| kwintouchscreenscriptsettings.kcfgc | ||
| kwintouchscreensettings.kcfg | ||
| kwintouchscreensettings.kcfgc | ||
| main.cpp | ||
| main.h | ||
| main.ui | ||
| Messages.sh | ||
| monitor.cpp | ||
| monitor.h | ||
| screenpreviewwidget.cpp | ||
| screenpreviewwidget.h | ||
| touch.cpp | ||
| touch.h | ||
| touch.ui | ||