Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_metal.h # examples/imgui_impl_metal.mm docking
commit cc48f1e5dd27da29081ea2582ffe1dbaf88f613f 2 parents 8dc04a4 + c3d600a omar authored on 30 May 2019

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/imgui_impl_metal.h

Ignore Space Show notes View examples/imgui_impl_metal.mm

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Show line notes below