l10n daemon script 5ebbc6a7a3 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-03-05 09:55:50 +00:00
..
CMakeLists.txt	[backends/fbdev] Use BaseScreens implementation	2015-11-17 10:46:32 +01:00
fb_backend.cpp	[backends/fbdev] Support framebuffers with different color depths	2015-12-15 13:05:00 +01:00
fb_backend.h	[backends/fbdev] Use BaseScreens implementation	2015-11-17 10:46:32 +01:00
fbdev.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
logging.cpp	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
logging.h	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
scene_qpainter_fb_backend.cpp
scene_qpainter_fb_backend.h