| commit | 72ebd91567148b4d3dca073c7229c4c0462a0586 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Oct 05 15:10:45 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu Oct 05 15:10:45 2023 +0200 |
| tree | 239432c3f6f1da512df51f215699ebb5ea7a21b9 | |
| parent | 9064dbd4044a6975a050e99e56748f7e0cbc3c54 [diff] | |
| parent | 2c07d581de7396753ea873fb765ffc7d411fecad [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.h