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 e24e39b528 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"
9 years ago
..
CMakeLists.txt
fb_backend.cpp
fb_backend.h
fbdev.json SVN_SILENT made messages (.desktop file) - always resolve ours 9 years ago
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h