l10n daemon script e24e39b528 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"		2015-11-26 15:58:56 +00:00
..
CMakeLists.txt	[backends/wayland] Use BasicScreens implementation	2015-11-17 10:43:10 +01:00
egl_wayland_backend.cpp	Add pure virtual OpenGLBackend::init() method	2015-11-26 08:33:07 +01:00
egl_wayland_backend.h	Add pure virtual OpenGLBackend::init() method	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_wayland_backend.cpp	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
scene_qpainter_wayland_backend.h	[wayland] Move WaylandQPainterBackend into backends/wayland	2015-05-05 15:13:36 +02:00
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-26 15:58:56 +00:00
wayland_backend.cpp	[backends/wayland] Use BasicScreens implementation	2015-11-17 10:43:10 +01:00
wayland_backend.h	[backends/wayland] Use BasicScreens implementation	2015-11-17 10:43:10 +01:00