l10n daemon script b65d504a49 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"		2017-12-05 05:00:30 +01:00
..
CMakeLists.txt
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-05 05:00:30 +01:00
scene_opengl.cpp	[SceneOpenGL] Port from QRegion::rects() to QRegion iterators	2017-12-02 10:05:04 +01:00
scene_opengl.h