5 Commits (9ddb8493d5ee832fde957ec0a389ea9b083ebc6a)

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 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