l10n daemon script df306a4062 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"		2017-02-28 12:58:59 +01:00
..
CMakeLists.txt
egl_gbm_backend.cpp
egl_gbm_backend.h
scene_qpainter_virtual_backend.cpp	Convert virtual backend to per screen rendering	2016-11-11 12:56:54 +00:00
scene_qpainter_virtual_backend.h	Convert virtual backend to per screen rendering	2016-11-11 12:56:54 +00:00
screens_virtual.cpp
screens_virtual.h	Convert virtual backend to per screen rendering	2016-11-11 12:56:54 +00:00
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-28 12:58:59 +01:00
virtual_backend.cpp
virtual_backend.h	Convert virtual backend to per screen rendering	2016-11-11 12:56:54 +00:00