l10n daemon script 498d40d069 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"		2018-01-19 06:54:41 +01:00
..
CMakeLists.txt
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-19 06:54:41 +01:00
scene_opengl.cpp
scene_opengl.h