l10n daemon script afc80b580a 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-08-30 08:05:15 +02:00
..
CMakeLists.txt	[DRM plugin] Reorganize DrmBuffer	2017-05-09 21:00:33 +02:00
drm.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
drm_backend.cpp	[platforms/drm] Delete buffer on all errors in present	2017-07-14 13:42:52 +02:00
drm_backend.h	[DRM plugin] No forward declare of DrmSurfaceBuffer without GBM	2017-05-11 23:53:24 +02:00
drm_buffer.cpp	[DRM plugin] Reorganize DrmBuffer	2017-05-09 21:00:33 +02:00
drm_buffer.h	[DRM plugin] Reorganize DrmBuffer	2017-05-09 21:00:33 +02:00
drm_buffer_gbm.cpp	[DRM plugin] Reorganize DrmBuffer	2017-05-09 21:00:33 +02:00
drm_buffer_gbm.h	[DRM plugin] Reorganize DrmBuffer	2017-05-09 21:00:33 +02:00
drm_inputeventfilter.cpp
drm_inputeventfilter.h
drm_object.cpp	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object.h	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object_connector.cpp	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object_connector.h	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object_crtc.cpp	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object_crtc.h	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object_plane.cpp	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_object_plane.h	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_output.cpp	Fix unuxed-but-set-variable warning	2017-07-29 19:01:55 +02:00
drm_output.h	[DRM plugin] Correct Atomic Mode Setting	2017-05-09 21:29:10 +02:00
drm_pointer.h
egl_gbm_backend.cpp
egl_gbm_backend.h
logging.cpp
logging.h
scene_qpainter_drm_backend.cpp
scene_qpainter_drm_backend.h	[DRM plugin] Reorganize DrmBuffer	2017-05-09 21:00:33 +02:00
screens_drm.cpp
screens_drm.h