l10n daemon script 75f3964db7 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"		2015-10-25 10:45:05 +00:00
..
CMakeLists.txt	[backends/virtual] Add a virtual rendering OpenGLBackend	2015-10-08 16:12:09 +02:00
egl_gbm_backend.cpp	[backends/virtual] Add a virtual rendering OpenGLBackend	2015-10-08 16:12:09 +02:00
egl_gbm_backend.h	[backends/virtual] Add a virtual rendering OpenGLBackend	2015-10-08 16:12:09 +02:00
scene_qpainter_virtual_backend.cpp	[backends/virtual] Move save screenshot functionality to the backend	2015-10-08 15:53:03 +02:00
scene_qpainter_virtual_backend.h	[backends/virtual] Move save screenshot functionality to the backend	2015-10-08 15:53:03 +02:00
screens_virtual.cpp	[backends/virtual] Add possibility to have multiple virtual screens	2015-10-14 16:38:17 +02:00
screens_virtual.h	[backends/virtual] Add possibility to have multiple virtual screens	2015-10-14 16:38:17 +02:00
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
virtual_backend.cpp	[backends/virtual] Add a virtual rendering OpenGLBackend	2015-10-08 16:12:09 +02:00
virtual_backend.h	[backends/virtual] Add possibility to have multiple virtual screens	2015-10-14 16:38:17 +02:00