| commit | 7bfc379a23e97b6777eb80aafb50a8e6248904cd | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Mon Jul 19 21:58:06 2021 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Mon Jul 19 21:58:06 2021 +0200 |
| tree | fec51c5de517f97dd5e7f7d5407d6acbe1f616b5 | |
| parent | 3d5dc0d93939bd9d547f6764025e141e124fac56 [diff] | |
| parent | c881667c00655c98dba41deb942587e0041d0ed0 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h