l10n daemon script fcdc3e5a2c 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-11-04 09:48:38 +00: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	2016-11-04 09:48:38 +00:00
wayland_backend.cpp	[platforms/wayland] Use XdgShell if available and prefer it	2016-07-20 07:43:59 +02:00
wayland_backend.h	[platforms/wayland] Use XdgShell if available and prefer it	2016-07-20 07:43:59 +02:00