tree 5ccde7dfd393e591280a18cd6c8cde5f478045e0
parent d55608a5bb8c8a6890957b9e216f969c9407265b
parent ce855cada2f1b27e4f6dd15b54b7f6e6fc22784b
author ocornut <omar@miracleworld.net> 1776346197 +0200
committer ocornut <omar@miracleworld.net> 1776346197 +0200

Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_sdl2.cpp