l10n daemon script 9bf7ad4a9f 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"		2016-01-12 12:09:37 +00:00
..
CMakeLists.txt
egl_gbm_backend.cpp
egl_gbm_backend.h
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	2016-01-12 12:09:37 +00:00
virtual_backend.cpp
virtual_backend.h