| commit | d79514c407cbcd6f270533b8f297514c608d45c8 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Feb 14 14:32:17 2024 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Feb 14 14:32:17 2024 +0100 |
| tree | 49955abff795c381318ac0cf589cb6e685ad5cba | |
| parent | 8490a262c45a27dc5acbc0ef68f81ed4ba784cf1 [diff] | |
| parent | 5b6f03213dde8c6ca9bea4707321cca79f2265ec [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx9.cpp # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_vulkan.cpp # imgui.cpp