l10n daemon script b20ccf91c6 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-18 11:06:54 +00:00
..
CMakeLists.txt	Create a plugin for each of the wayland backends	2015-05-06 10:31:39 +02:00
drm.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-18 11:06:54 +00:00
drm_backend.cpp	Fix build with some compilers	2015-09-11 14:53:34 +02:00
drm_backend.h	[drm] Mark outputs as disabled in backend depending on DPMS state	2015-09-10 14:31:46 +02:00
egl_gbm_backend.cpp	[backends/drm] Drm backend support syncsToVBlank	2015-07-17 20:39:37 +02:00
egl_gbm_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_drm_backend.cpp
scene_qpainter_drm_backend.h
screens_drm.cpp	[drm] Implement Screens::refreshRate	2015-05-19 09:49:37 +02:00
screens_drm.h	[drm] Implement Screens::refreshRate	2015-05-19 09:49:37 +02:00