l10n daemon script 24ad81e91b 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"		2021-10-29 01:21:24 +00:00
..
CMakeLists.txt
egl_gbm_backend.cpp	Rename PlatformSurfaceTexture to SurfaceTexture	2021-10-21 10:21:56 +03:00
egl_gbm_backend.h	Rename PlatformSurfaceTexture to SurfaceTexture	2021-10-21 10:21:56 +03:00
scene_qpainter_virtual_backend.cpp
scene_qpainter_virtual_backend.h
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-29 01:21:24 +00:00
virtual_backend.cpp
virtual_backend.h
virtual_output.cpp
virtual_output.h