HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. examples/imgui_impl_win32.cpp
  3. imgui.cpp

Event Timeline

ocornut <omarcornut@gmail.com> committed rIMGUIa7ace918fec1: Merge branch 'master' into docking (authored by ocornut <omarcornut@gmail.com>).Mar 5 2020, 11:48 AM