Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp docking
commit 93b032ea92d40ea0d888f3bde3d577579c285a5f 2 parents 03c8a78 + 6d98c03 omar authored on 5 Jun 2018

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View TODO.txt

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_internal.h

Ignore Space Show notes View misc/fonts/README.txt

Ignore Space Show notes View misc/freetype/README.md

Show line notes below