ocornut fa004ae79a Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_examples.sln
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx12.h
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
#	imgui_widgets.cpp

2020-09-22 17:00:57 +02:00

20 KiB

Raw Blame History

View Raw