l10n daemon script b9f5aa3cf6 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-11-07 04:44:27 +01:00
..
CMakeLists.txt
opengl.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-11-07 04:44:27 +01:00
scene_opengl.cpp	Render GL Window decorations at the correct scale	2017-11-01 17:59:11 +00:00
scene_opengl.h