HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. imgui.cpp
  3. imgui_draw.cpp

Details

Provenance
omar <omarcornut@gmail.com>Authored on Mar 19 2020, 12:44 PM
YbalridPushed on Apr 3 2020, 11:11 PM
Parents
rIMGUIea0399414cb5: Merge branch 'master' into docking
rIMGUIfbc93debf965: Internal: Refactor: Moved NewFrameSanityChecks as…
Branches
Unknown
Tags
Unknown

Event Timeline

omar <omarcornut@gmail.com> committed rIMGUI16a9488c13f2: Merge branch 'master' into docking (authored by omar <omarcornut@gmail.com>).Mar 19 2020, 12:44 PM

Merged Changes