Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui.h docking
commit 056af2b1afd14e2ecca31483400bd93017d953cd 2 parents 5f79a28 + 82873c7 omar authored on 18 Oct 2018

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/README.txt

Show line notes below