Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_opengl3.cpp docking
commit 49eb5f02808a0b17ee37d5da96c69bb5857aba81 2 parents 7a536f1 + beb3062 omar authored on 3 Mar 2019

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View examples/imgui_impl_opengl3.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below