9 Commits (e6c982509d899d2c276711e5d0999d59672d03c2)

Author	SHA1	Message	Date
omar	76e61958fd	Merge branch 'master' into docking ... # Conflicts: # examples/README.txt # examples/imgui_impl_dx9.cpp # imgui.cpp # imgui.h	6 years ago
omar	6c196cf432	Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.	6 years ago
omar	b89202824e	Merge branch 'master' into docking ... # Conflicts: # examples/imgui_impl_sdl.cpp	6 years ago
omar	35cbf9c052	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.	6 years ago
omar	cf029b3e1c	Merge branch 'master' into docking	6 years ago
omar	42423d5ea4	Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297)	6 years ago
omar	43a85dd02e	Merge branch 'master' into docking	6 years ago
omar	cdb109f617	Renamed freeglut vcxproj files + Comments, Changelog (#2465)	6 years ago
Andrew Willmott	ece322ff12	freeglut -> glut rename	6 years ago