| commit | ea4565368ebc9e3f79b65becadb5490534e1819d | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Feb 10 17:05:06 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Fri Feb 10 17:05:06 2023 +0100 |
| tree | 7aa032cdbbbdf2512a29376a995411ec9be4a226 | |
| parent | 0d7d877cb5b0702e9ed3e62b0272a8e78eac1f5e [diff] | |
| parent | f0ac68ad35d3ad99f12e583665374e9861a1cb7b [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl2.h # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_sdl3.h # imgui.cpp