Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp docking
commit 835a8b2c9b071b1bd8627b4042a70c307d019bd5 2 parents 239c873 + 7c256fb omar authored on 10 May 2019

Patch

Unified Split

Showing 10 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/TODO.txt

Ignore Space Show notes View examples/README.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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/fonts/README.txt

Show line notes below