l10n daemon script 22da928d2b 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-11-13 10:44:04 +00:00
..
CMakeLists.txt
egl_gbm_backend.cpp	Handle conflicts between epoxy and manually resolved function pointers	2015-11-11 08:04:29 +01:00
egl_gbm_backend.h
scene_qpainter_virtual_backend.cpp
scene_qpainter_virtual_backend.h
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-11-13 10:44:04 +00:00
virtual_backend.cpp
virtual_backend.h	[backends/virtual] Add possibility to have multiple virtual screens	2015-10-14 16:38:17 +02:00