omar 992736dc5d Merge branch 'refs/heads/master' into docking ...

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp

2019-12-13 17:06:27 +01:00

39 KiB

Raw Blame History

View Raw