819c645863
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_gbm_backend.cpp | ||
egl_gbm_backend.h | ||
scene_qpainter_virtual_backend.cpp | ||
scene_qpainter_virtual_backend.h | ||
screens_virtual.cpp | ||
screens_virtual.h | ||
virtual.json | ||
virtual_backend.cpp | ||
virtual_backend.h |