| commit | e3ac52630a727ddaa5d642cba8b57d0b166e9fd0 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Sat Oct 31 00:47:17 2020 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Sat Oct 31 00:47:57 2020 +0100 |
| tree | 1bd944d6e4fa04d7575dbeecac28d78c7bee1abd | |
| parent | 455c21df7100a4727dd6e4c8e69249b7de21d24c [diff] | |
| parent | 047d4c4500fc08b64d800eceae9951fc01c0a78b [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_opengl3.cpp # imgui.cpp