Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h docking
commit 7227454dca80c6e0385051aba147cd44bfff7f93 2 parents f087359 + c23a19c omar authored on 3 Feb 2019

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below