l10n daemon script 696028bdb2 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-10-13 05:05:58 +02:00
..
CMakeLists.txt
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-13 05:05:58 +02:00
scene_opengl.cpp
scene_opengl.h