Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit fd201a90f13b54730427d2ed3763f1e27d733bb0 2 parents a52ce7a + 767649a omar authored on 31 Aug 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/README.txt

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_widgets.cpp

Show line notes below