| commit | aec062a8a59e09e910bee40954d962122563c378 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Apr 11 16:16:17 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Tue Apr 11 16:16:17 2023 +0200 |
| tree | 5f1b94bcd9df880fbd0d505b5891d15c0b8bb03d | |
| parent | 1668693bcfbc8669db60e775fd19f3a4ac26fe89 [diff] | |
| parent | d81f2ae4fbf7b19ebaf0540a9c481759f1681153 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # docs/CHANGELOG.txt # examples/example_win32_directx9/main.cpp # imgui_internal.h