HomePhabricator

Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking

Description

Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking

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

Event Timeline

Merged Changes