| tag | ebd188d9a17de59f7f3f6604fd8145cc026925d6 | |
|---|---|---|
| tagger | ocornut <omarcornut@gmail.com> | Wed Sep 04 17:19:18 2024 +0200 |
| object | f63c95a076a401721ceaf21f30d4f12e8c40cb2c |
| commit | f63c95a076a401721ceaf21f30d4f12e8c40cb2c | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Sep 04 16:58:44 2024 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Wed Sep 04 16:58:44 2024 +0200 |
| tree | d53b2c2e0fad15b66b65f9b186b822c64c2bc06f | |
| parent | 6d70c2dc739a42ae08b51813f0143ff854db7f2c [diff] | |
| parent | 1dfbb100d6ca6e7d813102e979c07f66a56546bb [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_sdl3.cpp # docs/CHANGELOG.txt # imgui.cpp # imgui.h # imgui_internal.h