Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp docking
commit 4a3a895be9ee1267e27089f6d314e3cc833b18af 2 parents f6fbb99 + 29d38b5 omar authored on 6 Feb 2019

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 docs/TODO.txt

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

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View imstb_textedit.h

Show line notes below