l10n daemon script afc80b580a 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"		2017-08-30 08:05:15 +02:00
..
CMakeLists.txt	Move the EglOnXBackend to the x11 platforms	2016-04-15 09:15:20 +02:00
egl_x11_backend.cpp	Scale xwindowed EGL output	2017-03-29 20:53:22 +01:00
egl_x11_backend.h	Move the x11 plugin sources into a x11/windowed directory	2016-04-12 08:04:16 +02:00
logging.cpp	Move the x11 plugin sources into a x11/windowed directory	2016-04-12 08:04:16 +02:00
logging.h	Move the x11 plugin sources into a x11/windowed directory	2016-04-12 08:04:16 +02:00
scene_qpainter_x11_backend.cpp	Scale QPainter x11 windowed backend	2017-03-29 20:53:22 +01:00
scene_qpainter_x11_backend.h	Move the x11 plugin sources into a x11/windowed directory	2016-04-12 08:04:16 +02:00
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
x11windowed_backend.cpp	Scale xwindowed EGL output	2017-03-29 20:53:22 +01:00
x11windowed_backend.h	Scale input on windowed backend so input co-ordinate system matches host	2017-03-29 20:53:22 +01:00