l10n daemon script c7aa721273 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"		2018-10-24 08:42:22 +02:00
..
CMakeLists.txt	[platforms/virtual] Always link SceneOpenGLBackend	2017-10-03 19:19:35 +02:00
egl_gbm_backend.cpp	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
egl_gbm_backend.h	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
scene_qpainter_virtual_backend.cpp
scene_qpainter_virtual_backend.h	Move QPainter compositor into plugin	2017-09-01 17:44:49 +02:00
screens_virtual.cpp
screens_virtual.h
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-24 08:42:22 +02:00
virtual_backend.cpp	[colorcorrection] Night Color - blue light filter at nighttime	2017-12-11 10:58:40 +01:00
virtual_backend.h	[colorcorrection] Night Color - blue light filter at nighttime	2017-12-11 10:58:40 +01:00