| commit | 9298e310b274e9431d49873836338a9c096b89d9 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Nov 02 17:56:54 2023 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Nov 02 18:05:43 2023 +0100 |
| tree | c41df8acebbedb313aa57219cedac729e714b3bf | |
| parent | 04e9a2fac164ae9f397551346c6c82fe3a1aa809 [diff] | |
| parent | c0bc43ccff04b1395b2bbfe0b802f07e2c426f43 [diff] |
Merge branch 'master' into docking (note: won't build as-is, see next commit) # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h