| commit | 16a9488c13f2889726fbcc06cdd224f954501bdd | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Thu Mar 19 12:44:53 2020 +0100 |
| committer | omar <omarcornut@gmail.com> | Thu Mar 19 12:44:53 2020 +0100 |
| tree | d50782440a426b4302fb68825eea144c83a5c706 | |
| parent | ea0399414cb5da8e45fa090c19b8416058525923 [diff] | |
| parent | fbc93debf96521350ee93eb74fa30c4de42e0707 [diff] |
Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_draw.cpp