| commit | e863f89d391625c360b232c9fe4b30f378c142eb | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Jun 20 17:45:47 2024 -0700 |
| committer | ocornut <omarcornut@gmail.com> | Thu Jun 20 17:47:22 2024 -0700 |
| tree | 91f88480ca2e71988dd80fb7c296329582095462 | |
| parent | 416cfdb99d9e2eb251cf64fd45d5715ba4b49e23 [diff] | |
| parent | 21581cf70cef16db7e9a7095703f3233997596ff [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp