| commit | a88e5be7f478233e74c72c72eabb1d5f1cb69bb5 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Wed Jun 28 14:56:02 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Wed Jun 28 14:56:33 2023 +0200 |
| tree | ff8917dc0cdbee8ef5ee74cdfb6c08669b2d55fe | |
| parent | 6b011140576d5b7f94a6716235fc287ffb34ae34 [diff] | |
| parent | 6137443d24948a1d3bde507835435d8ef4814ed9 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_widgets.cpp