l10n daemon script 4d41e877c3 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-07-23 05:20:30 +02:00
..
CMakeLists.txt	[platform/virtual] Drop support for vgem and rendernode	2019-01-12 07:37:25 +01:00
egl_gbm_backend.cpp	Port away from deprecated QImage::byteCount	2019-07-10 02:02:15 +03:00
egl_gbm_backend.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
scene_qpainter_virtual_backend.cpp	Add scaling to virtual backend	2017-03-29 20:53:22 +01:00
scene_qpainter_virtual_backend.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
screens_virtual.cpp	[platforms/virtual] Let VirtualOutput inherit Output	2018-08-31 11:56:39 +02:00
screens_virtual.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-23 05:20:30 +02:00
virtual_backend.cpp	[platform/virtual] Drop support for vgem and rendernode	2019-01-12 07:37:25 +01:00
virtual_backend.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00
virtual_output.cpp	[platforms/x11/standalone] Port to AbstractOutput	2019-06-13 11:39:25 +02:00
virtual_output.h	Run clang-tidy with modernize-use-override check	2019-07-22 20:03:22 +03:00