Merge branch 'master' into examples_refactor

Fork: 0

mark / imgui

Browse code Merge branch 'master' into examples_refactor # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp docking
commit 3f335b0d421ad1b4bd5009f405216a00cff8f6c5 2 parents ffda84c + a869e94 omar authored on 26 Feb 2018

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View CHANGELOG.txt 0 → 100644

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View stb_truetype.h

Show line notes below