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

# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	imgui.cpp
#	imgui_internal.h

2020-01-27 14:57:00 +01:00

..

example_glut_opengl2.vcxproj

…

example_glut_opengl2.vcxproj.filters

…

main.cpp

Merge branch 'master' into docking

2020-01-27 14:57:00 +01:00

Makefile

Bindings: Improved FreeGLUT support for MinGW (#3004)

2020-01-27 12:11:29 +01:00