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

Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.

2019-04-15 15:48:38 +02:00

example_glut_opengl2.vcxproj.filters

Renamed freeglut vcxproj files + Comments, Changelog (#2465)

2019-04-03 16:25:35 +02:00

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