| commit | f94af2f5c559b6ea26e746df5704f607b87f1bb1 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Sun Jan 20 22:13:35 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Sun Jan 20 22:13:35 2019 +0100 |
| tree | 7c235395971794c2f69caff6b6b874667abc2763 | |
| parent | b5144e477f1ea627c0fa1a4c33df93c88443e89d [diff] | |
| parent | 8079344ceef3c7e03030db7794d9c8f300e798d0 [diff] |
Merge branch 'viewport' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp