HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. imgui.cpp

Event Timeline

ocornut <omarcornut@gmail.com> committed rIMGUIea0399414cb5: Merge branch 'master' into docking (authored by ocornut <omarcornut@gmail.com>).Mar 11 2020, 10:30 PM

Merged Changes