| commit | d378e4088ff2fc490633b22f68e57f73da9756c4 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Tue Feb 01 15:46:42 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Tue Feb 01 15:46:42 2022 +0100 |
| tree | 6024a8826f24fc0ac422df1bd609e6cd7d8a7ea6 | |
| parent | 08350e53e79e2dd44ee40e1143ffcf79401af1fc [diff] | |
| parent | 43177324c081868116a99f634e2d5bf38b54056b [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_draw.cpp