l10n daemon script dc447860be 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-04-25 10:05:35 +02:00
..
CMakeLists.txt	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
egl_wayland_backend.cpp	Support restarting the OpenGL compositor on Wayland	2016-07-20 14:08:23 +02:00
egl_wayland_backend.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
logging.cpp	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
logging.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
scene_qpainter_wayland_backend.cpp	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
scene_qpainter_wayland_backend.h	Move backends/ to plugins/platforms/	2016-04-12 08:01:27 +02:00
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-25 10:05:35 +02:00
wayland_backend.cpp	Add support for pointer gestures to nested Wayland platform	2017-03-18 14:39:30 +01:00
wayland_backend.h	Add support for pointer gestures to nested Wayland platform	2017-03-18 14:39:30 +01:00