Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp # imgui.h docking
commit 85f3ba844cec0e452acf5b3ada7c68021ddd48a5 2 parents 090eb43 + fc7fc83 omar authored on 11 May 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 examples/imgui_impl_sdl2.cpp

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

Show line notes below