Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h docking
commit 712203dbcbb5ed5684123ca1bba29852118b9eb0 2 parents 800fb26 + e805ca2 omar authored on 13 Apr 2019

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below