l10n daemon script 9472756205 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-01 13:09:20 +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
logging.h
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-03-01 13:09:20 +00:00
x11windowed_backend.cpp	Rework cursor image handling for Wayland	2016-02-25 08:14:48 +01:00
x11windowed_backend.h	Rework cursor image handling for Wayland	2016-02-25 08:14:48 +01:00