HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. examples/imgui_impl_opengl3.cpp
  3. imgui.h

Event Timeline

omar <omarcornut@gmail.com> committed rIMGUI0e884304ee03: Merge branch 'master' into docking (authored by omar <omarcornut@gmail.com>).Apr 2 2020, 2:27 PM

Merged Changes