l10n daemon script fcdc3e5a2c 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"		2016-11-04 09:48:38 +00:00
..
CMakeLists.txt
fb_backend.cpp
fb_backend.h
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-04 09:48:38 +00:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h