l10n daemon script c54ec46b65 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-02-03 09:28:15 +00:00
..
CMakeLists.txt	[backends/x11] Add a dedicated EGL backend for multi-surface rendering	2015-11-26 08:33:07 +01:00
egl_x11_backend.cpp	[backends/x11] Add a dedicated EGL backend for multi-surface rendering	2015-11-26 08:33:07 +01:00
egl_x11_backend.h	[backends/x11] Add a dedicated EGL backend for multi-surface rendering	2015-11-26 08:33:07 +01: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_x11_backend.cpp	[backends/x11] Prepare QPainter backend for multi screen rendering	2015-11-26 08:33:07 +01:00
scene_qpainter_x11_backend.h	[backends/x11] Prepare QPainter backend for multi screen rendering	2015-11-26 08:33:07 +01:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-03 09:28:15 +00:00
x11windowed_backend.cpp	[backends/x11] Add a dedicated EGL backend for multi-surface rendering	2015-11-26 08:33:07 +01:00
x11windowed_backend.h	[backends/x11] Prepare for multi-output rendering	2015-11-26 08:33:07 +01:00