omar e2c1f0a7cd Merge branch 'master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt

2019-06-18 23:12:50 +02:00

..

example_glut_opengl2.vcxproj

…

example_glut_opengl2.vcxproj.filters

…

main.cpp

Merge branch 'master' into docking

2019-06-18 23:12:50 +02:00

Makefile

…