HomePhabricator

Merge branch 'master' into docking

Description

Merge branch 'master' into docking

  1. Conflicts:
  2. docs/CHANGELOG.txt
  3. examples/example_win32_directx11/main.cpp
  4. examples/example_win32_directx9/main.cpp
  5. examples/imgui_impl_win32.cpp
  6. examples/imgui_impl_win32.h
  7. imgui.cpp

Event Timeline

Omar <omarcornut@gmail.com> committed rIMGUIbb1e6f8af603: Merge branch 'master' into docking (authored by Omar <omarcornut@gmail.com>).Feb 17 2020, 6:33 PM

Merged Changes