Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h docking
commit b27fd8717724bc9054a95e735a4dd0b4458cca0a 2 parents 07d3083 + b82e99c omar authored on 17 Jun 2019

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View docs/CHANGELOG.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