l10n daemon script c342be5961 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"		2015-10-03 11:20:49 +00:00
..
CMakeLists.txt	Drop cmakedefine HAVE_WAYLAND_EGL	2015-08-12 11:39:20 +02:00
egl_wayland_backend.cpp	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
egl_wayland_backend.h
logging.cpp	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
logging.h	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
scene_qpainter_wayland_backend.cpp	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
scene_qpainter_wayland_backend.h
screens_wayland.cpp	[wayland] Dedicate logging category for each of the backends	2015-05-05 17:47:03 +02:00
screens_wayland.h
wayland.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-03 11:20:49 +00:00
wayland_backend.cpp	Drop cmakedefine HAVE_WAYLAND_EGL	2015-08-12 11:39:20 +02:00
wayland_backend.h	Create a plugin for each of the wayland backends	2015-05-06 10:31:39 +02:00