l10n daemon script 83cc5f5842 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-05 10:23:58 +00:00
..
CMakeLists.txt
scene_qpainter_virtual_backend.cpp
scene_qpainter_virtual_backend.h
screens_virtual.cpp
screens_virtual.h
virtual.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-05 10:23:58 +00:00
virtual_backend.cpp	[wayland] Add a virtual framebuffer backend	2015-10-02 10:58:33 +02:00
virtual_backend.h