Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_demo.cpp # imgui_widgets.cpp docking
commit 991b16cc6a821070d98a97a38f9643407f297b40 2 parents 067b691 + 1b263f6 omar authored on 11 Dec 2018

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

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below