l10n daemon script 226edf8b03 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-09-28 11:55:23 +00:00
..
CMakeLists.txt
egl_x11_backend.cpp
egl_x11_backend.h
logging.cpp
logging.h
scene_qpainter_x11_backend.cpp
scene_qpainter_x11_backend.h
x11.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-28 11:55:23 +00:00
x11windowed_backend.cpp	[platforms/x11] Support output removal in nested setup	2016-08-08 09:24:44 +02:00
x11windowed_backend.h