l10n daemon script b62c8fb401 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-04-09 05:32:55 +02:00
..
CMakeLists.txt
drm.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-09 05:32:55 +02:00
drm_backend.cpp
drm_backend.h
drm_buffer.cpp
drm_buffer.h
drm_inputeventfilter.cpp
drm_inputeventfilter.h
drm_object.cpp
drm_object.h
drm_object_connector.cpp
drm_object_connector.h
drm_object_crtc.cpp
drm_object_crtc.h
drm_object_plane.cpp
drm_object_plane.h
drm_output.cpp
drm_output.h
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
screens_drm.cpp
screens_drm.h