HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

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

Details

Provenance
omar <omarcornut@gmail.com>Authored on Jan 27 2020, 2:57 PM
YbalridPushed on Apr 3 2020, 11:11 PM
Parents
rIMGUIf68075b333b0: Docking: Added DockNodeFlagsOverrideSet/DockNodeFlagsOverrideClear…
rIMGUI4d4e3b97f4c9: TODO, Readme
Branches
Unknown
Tags
Unknown

Event Timeline

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

Merged Changes