| commit | 06e4f4e3702c2e81833c3ebbdf88950f45a820e2 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Dec 03 19:24:42 2021 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Fri Dec 03 19:24:42 2021 +0100 |
| tree | 1f6eb1ec4123088f59ab2f2632d66c2d7f06e3da | |
| parent | 1dc3af381aeb0574d3080c1a105d43c56b087c7e [diff] | |
| parent | 23ef6c149ea14d8a5981cfec02994dcd7d21d09e [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdlrenderer.cpp # backends/imgui_impl_sdlrenderer.h # imgui.cpp # imgui.h