| commit | 06e87014f25ee2ac75661cff624dd2ef0a9b62ea | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Dec 11 23:10:06 2020 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Fri Dec 11 23:10:06 2020 +0100 |
| tree | c5a461433fcdff4121ff6f159ce100a742d438aa | |
| parent | dd4ca70b0d612038edadcf37bf601c0f21206d28 [diff] | |
| parent | 738606a2943a8a11316fa15b319193a2baa84bc0 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.h # imgui_internal.h