l10n daemon script a10ed44aa0 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-12-29 11:30:35 +00:00
..
CMakeLists.txt
drm.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-29 11:30:35 +00:00
drm_backend.cpp	[drm] Support configuring absolute output position	2015-11-06 14:48:52 +01:00
drm_backend.h	[drm] Support configuring absolute output position	2015-11-06 14:48:52 +01:00
egl_gbm_backend.cpp	Add pure virtual OpenGLBackend::init() method	2015-11-26 08:33:07 +01:00
egl_gbm_backend.h	Add pure virtual OpenGLBackend::init() method	2015-11-26 08:33:07 +01:00
logging.cpp	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
logging.h
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