| commit | 848d21b6b56d369fb7976bd88b5f4094ab9ea50a | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Dec 01 15:37:40 2021 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Dec 01 15:37:40 2021 +0100 |
| tree | defda4d58ceb498e0df3d94e57407087bdf20362 | |
| parent | 1ab3007752a78b8bb41df2cdda2729d8522e8328 [diff] | |
| parent | 5b1a70aa2dafcd589843deb3bd7e97473b47d3ec [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdlrenderer.cpp # backends/imgui_impl_sdlrenderer.h # imgui.cpp # imgui_widgets.cpp