HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. docs/CHANGELOG.txt
  3. examples/imgui_impl_opengl3.cpp
  4. imgui.cpp

Event Timeline

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

Merged Changes