Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h docking
commit 7e67aba286b21acb802ffbdc0b32c1f86e1f4122 2 parents a649d90 + 0f28528 omar authored on 29 Apr 2019

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below