| commit | c1ffac2fee77dc39b8385b9825c20b70bd4cae72 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Dec 03 20:05:49 2020 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Thu Dec 03 20:05:49 2020 +0100 |
| tree | e3d94c08dc1b09aff8c79c6eaff483f85c13da57 | |
| parent | 4da92b89ed5861d4630d4ed2c3c702ad962b2202 [diff] | |
| parent | 998d7303b1a3a0ae57b4599698b0c53e51be06cb [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h