df306a4062
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 | ||
| egl_wayland_backend.cpp | ||
| egl_wayland_backend.h | ||
| logging.cpp | ||
| logging.h | ||
| scene_qpainter_wayland_backend.cpp | ||
| scene_qpainter_wayland_backend.h | ||
| wayland.json | ||
| wayland_backend.cpp | ||
| wayland_backend.h | ||