l10n daemon script 3b3aa82f58 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-07-23 05:24:40 +02:00
..
CMakeLists.txt	[platforms/virtual] Add virtual output class	2018-03-19 22:12:22 +01:00
egl_gbm_backend.cpp	check for EGL_KHR_platform_gbm extension as well	2018-02-15 19:33:06 +01:00
egl_gbm_backend.h	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
scene_qpainter_virtual_backend.cpp	Add scaling to virtual backend	2017-03-29 20:53:22 +01:00
scene_qpainter_virtual_backend.h	Move QPainter compositor into plugin	2017-09-01 17:44:49 +02:00
screens_virtual.cpp	[platforms/virtual] Store virtual outputs per reference	2018-03-22 16:03:16 +01:00
screens_virtual.h	[platforms/virtual] Add virtual output class	2018-03-19 22:12:22 +01:00
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
virtual_backend.cpp	[platforms/virtual] Store virtual outputs per reference	2018-03-22 16:03:16 +01:00
virtual_backend.h	[platforms/virtual] Store virtual outputs per reference	2018-03-22 16:03:16 +01:00
virtual_output.cpp	[platforms/virtual] Make VirtualOutput non-copyable	2018-04-16 02:48:48 +03:00
virtual_output.h	[platforms/virtual] Make VirtualOutput non-copyable	2018-04-16 02:48:48 +03:00