| commit | 10a5a857f5b5cd6eae7f86461b939ec05e9235b2 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Jun 26 14:54:01 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Wed Jun 26 14:54:01 2024 +0200 |
| tree | 848597661ba292d4dfa0a509dbb680d5f3fa6055 | |
| parent | 7237d3e5c3a6b837b7b457460877cf5eea8c3745 [diff] | |
| parent | 7c2476986b5b01ecfab85eca064568634194d13a [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_win32.cpp # imgui.h