8 Commits (d3d998a885f7a5bbadc5af47b36ea5570af4b742)

Author	SHA1	Message	Date
omar	d3d998a885	Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/README.txt # imgui.cpp # imgui.h # imgui_internal.h # imgui_widgets.cpp	6 years ago
omar	2da1c66d15	Version 1.71 + comments	6 years ago
omar	431aa4e456	Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.	6 years ago
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