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	Port screenId based rendering methods to AbstractOutput	2021-08-25 13:53:33 +02:00
scene_qpainter_virtual_backend.h	Port screenId based rendering methods to AbstractOutput	2021-08-25 13:53:33 +02:00
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-10-29 01:21:24 +00:00
virtual_backend.cpp	platforms/virtual: Add new outputs before removing old outputs	2021-08-30 15:08:52 +00:00
virtual_backend.h
virtual_output.cpp	Remove globalPos() in AbstractWaylandOutput	2021-08-26 16:35:41 +03:00
virtual_output.h