You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 705cb1a9ad SVN_SILENT made messages (.desktop file) - always resolve ours
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"
8 years ago
..
CMakeLists.txt
egl_x11_backend.cpp
egl_x11_backend.h
logging.cpp
logging.h
scene_qpainter_x11_backend.cpp
scene_qpainter_x11_backend.h
x11.json SVN_SILENT made messages (.desktop file) - always resolve ours 8 years ago
x11windowed_backend.cpp
x11windowed_backend.h