| commit | ec461c6ccb73828adf4fff43edeeeca1dcd51e1e | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Apr 06 19:16:08 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu Apr 06 19:16:08 2023 +0200 |
| tree | c62f5c042dd14d6cc00061579606418068bed39b | |
| parent | 63370be0e5675077a4b8e122b9e3d9728522c44c [diff] | |
| parent | a7703fe6f74a78db58040813f9baae66b4fd053d [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # imgui_demo.cpp