| commit | d5f0d45ae46267a1ab54e9ff438196d29e8a611d | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Jan 27 17:50:31 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Jan 27 17:50:31 2022 +0100 |
| tree | c23f8bc9b995a21002d2b7523a28b492b87c8d76 | |
| parent | f1a073186c859facfc75823302b5c5b04f43293f [diff] | |
| parent | 9def2b04d7188cc6e95128c2bcabe2756ce7b395 [diff] |
Merge branch 'master' into docking + remove two _PopUnusedDrawCmd() from docking branch, following 718daa1 # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h