l10n daemon script c1e88d0af8 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-12-02 04:38:37 +01:00
..
CMakeLists.txt
egl_wayland_backend.cpp	Support restarting the OpenGL compositor on Wayland	2016-07-20 14:08:23 +02:00
egl_wayland_backend.h
logging.cpp
logging.h
scene_qpainter_wayland_backend.cpp
scene_qpainter_wayland_backend.h
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-02 04:38:37 +01: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