l10n daemon script db12cb6742 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"		2019-06-21 05:35:42 +02:00
..
CMakeLists.txt	[platform/virtual] Drop support for vgem and rendernode	2019-01-12 07:37:25 +01:00
egl_gbm_backend.cpp	[platform/virtual] Swap buffers in EGL GBM backend	2019-02-21 23:30:11 +01:00
egl_gbm_backend.h	[platform/virtual] Drop support for vgem and rendernode	2019-01-12 07:37:25 +01:00
scene_qpainter_virtual_backend.cpp
scene_qpainter_virtual_backend.h
screens_virtual.cpp
screens_virtual.h
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-21 05:35:42 +02:00
virtual_backend.cpp	[platform/virtual] Drop support for vgem and rendernode	2019-01-12 07:37:25 +01:00
virtual_backend.h	Restrict available supported compositors based on first initialized one	2019-02-22 16:59:08 +01:00
virtual_output.cpp	[platforms/x11/standalone] Port to AbstractOutput	2019-06-13 11:39:25 +02:00
virtual_output.h	Backport Night Color feature to X11	2019-06-17 12:09:04 +03:00