HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. examples/imgui_impl_win32.cpp
  3. examples/imgui_impl_win32.h
  4. imgui.cpp
  5. imgui_internal.h

Event Timeline

omar <omarcornut@gmail.com> committed rIMGUI44174b1fa181: Merge branch 'master' into docking (authored by omar <omarcornut@gmail.com>).Jan 14 2020, 8:01 PM

Merged Changes