l10n daemon script c59011af43 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-11-30 04:32:21 +01:00
..
CMakeLists.txt
egl_gbm_backend.cpp	[platforms/virtual] Pass ownership of gbm_device and drm fd to Platform	2016-08-19 15:40:39 +02:00
egl_gbm_backend.h	[platforms/virtual] Pass ownership of gbm_device and drm fd to Platform	2016-08-19 15:40:39 +02:00
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	2016-11-30 04:32:21 +01:00
virtual_backend.cpp	[platforms/virtual] Pass ownership of gbm_device and drm fd to Platform	2016-08-19 15:40:39 +02:00
virtual_backend.h	Convert virtual backend to per screen rendering	2016-11-11 12:56:54 +00:00