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

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/README.txt
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp

2019-06-12 18:40:50 +02: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

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

Makefile

Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297)

2019-04-07 23:02:07 +02:00