l10n daemon script 43f575b415 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"		2017-12-13 07:01:42 +01:00
..
CMakeLists.txt
fb_backend.cpp	[platforms/fbdev] Support for RGBA8888 color format	2017-10-23 13:44:53 +05:30
fb_backend.h
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-13 07:01:42 +01:00
logging.cpp
logging.h
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h