6bb9f6db7b
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 | ||
| logging.cpp | ||
| logging.h | ||
| scene_qpainter_x11_backend.cpp | ||
| scene_qpainter_x11_backend.h | ||
| x11.json | ||
| x11windowed_backend.cpp | ||
| x11windowed_backend.h | ||