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	[platforms/fbdev] Handle error conditions more gracefully	2016-07-13 10:11:38 +02:00
fb_backend.h	[platforms/fbdev] Properly detect a BGR image format	2016-07-13 09:37:02 +02:00
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	[platforms/fbdev] Properly detect a BGR image format	2016-07-13 09:37:02 +02:00
scene_qpainter_fb_backend.h	Paint the software cursor directly in SceneQPainter	2016-06-29 08:50:46 +02:00