l10n daemon script 43f575b415 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-12-13 07:01:42 +01:00
..
CMakeLists.txt	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
egl_wayland_backend.cpp	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
egl_wayland_backend.h	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +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 QPainter compositor into plugin	2017-09-01 17:44:49 +02:00
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-13 07:01:42 +01:00
wayland_backend.cpp	Add a pure virtual method to Platform to describe the supported compositors	2017-10-18 21:19:43 +02:00
wayland_backend.h	Add a pure virtual method to Platform to describe the supported compositors	2017-10-18 21:19:43 +02:00