HomePhabricator

Merge branch 'refs/heads/master' into docking

Description

Merge branch 'refs/heads/master' into docking

  1. Conflicts:
  2. docs/CHANGELOG.txt
  3. examples/imgui_impl_glfw.cpp
  4. examples/imgui_impl_sdl.cpp
  5. examples/imgui_impl_win32.cpp
  6. imgui.cpp
  7. imgui_internal.h
  8. imgui_widgets.cpp

Event Timeline

omar <omarcornut@gmail.com> committed rIMGUI992736dc5d4e: Merge branch 'refs/heads/master' into docking (authored by omar <omarcornut@gmail.com>).Dec 13 2019, 5:06 PM

Merged Changes