997af81ea9
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 | ||
| edge.cpp | ||
| edge.h | ||
| glxbackend.cpp | ||
| glxbackend.h | ||
| logging.cpp | ||
| logging.h | ||
| screens_xrandr.cpp | ||
| screens_xrandr.h | ||
| windowselector.cpp | ||
| windowselector.h | ||
| x11.json | ||
| x11_platform.cpp | ||
| x11_platform.h | ||
| x11cursor.cpp | ||
| x11cursor.h | ||
| xinputintegration.cpp | ||
| xinputintegration.h | ||