| tag | 7b1838d26ca8b25a094764f3b6303ab2c216c594 | |
|---|---|---|
| tagger | ocornut <omarcornut@gmail.com> | Wed Nov 15 16:52:33 2023 +0100 |
| object | ce0d0ac8298ce164b5d862577e8b087d92f6e90e |
| commit | ce0d0ac8298ce164b5d862577e8b087d92f6e90e | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Nov 15 16:08:53 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Wed Nov 15 16:08:53 2023 +0100 |
| tree | 19bf278ec105f2ca5835af84e2b50e8f0ca50c9c | |
| parent | 6695006beaf69d5863f2de2a257debfa056ca720 [diff] | |
| parent | b81bd7ed984ce095c20a059dd0f4d527e006998f [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_vulkan.cpp # imgui.cpp