| commit | 575df6f192245ab467f218179047dbcce7b1b1f7 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Sep 17 16:35:50 2019 +0200 |
| committer | omar <omarcornut@gmail.com> | Tue Sep 17 16:35:50 2019 +0200 |
| tree | 85051c842bbfee788e0d1b78804445e80f184a59 | |
| parent | 0bdc1453433ab0bb4d889c72ef9b0353ba3998aa [diff] | |
| parent | b48dc067ae794cd9159397b338a985c0b906404d [diff] |
Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_draw.cpp # imgui_internal.h