HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. imgui.cpp
  3. imgui_internal.h

Event Timeline

omar <omarcornut@gmail.com> committed rIMGUI5be649e082a3: Merge branch 'master' into docking (authored by omar <omarcornut@gmail.com>).Feb 2 2020, 9:21 PM

Merged Changes