HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

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

Details

Provenance
omar <omarcornut@gmail.com>Authored on Dec 18 2019, 8:49 PM
YbalridPushed on Apr 3 2020, 11:11 PM
Parents
rIMGUI992736dc5d4e: Merge branch 'refs/heads/master' into docking
rIMGUIe01fb5462d4f: Internals: Separator: Simplify duplicated code.
Branches
Unknown
Tags
Unknown

Event Timeline

omar <omarcornut@gmail.com> committed rIMGUIc706ff6f3ab9: Merge branch 'master' into docking (authored by omar <omarcornut@gmail.com>).Dec 18 2019, 8:49 PM