| commit | 70fa37527df614c542bcfc9dba37e75b758f3d9f | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Wed Jul 29 15:15:14 2020 +0200 |
| committer | omar <omarcornut@gmail.com> | Wed Jul 29 15:15:14 2020 +0200 |
| tree | a0a2a54b456f04e0bcc14222c2bbfbd92ec3981a | |
| parent | 3d4af15d1d5f5d3746b69859308949c357e0c21e [diff] | |
| parent | 218ff3a2a5186a91bf1a053468e66727d1c34d73 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_draw.cpp # imgui_internal.h