Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h docking
commit ff0c6c2bdec5feaad2f1d1957709ffb4f3de362f 2 parents 4eecf80 + f02705f omar authored on 27 Feb 2019

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/example_allegro5/README.md

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

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

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below