Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h docking
commit 8414c0bb096a767775efc507c56f87b7fe3d8d35 2 parents 49eb5f0 + 94e794f omar authored on 4 Mar 2019

Patch

Unified Split

Showing 7 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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below