tree 5ebc4c6462473d576fa98f2d1f41b332bbf5c70d
parent 0fe5170bc400b789dcb3038eb0ead9d540927dfd
parent 5ddf60d8ce57ad119833003f9afd777c0b1a3a74
author ocornut <omarcornut@gmail.com> 1590424335 +0200
committer ocornut <omarcornut@gmail.com> 1590424335 +0200

Merge branch 'master' into docking + fixes for #3259

# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp