tree 16bba2ce23b98a1201cbbf1fedea4e45620028f8
parent 6b61e60e221817a5084c4576cc5bc42919142c5e
parent ac06ad7b48f196d206c867a0638f65a723196cb2
author ocornut <omar@miracleworld.net> 1776953221 +0200
committer ocornut <omar@miracleworld.net> 1776953221 +0200

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp