Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui.cpp # imgui_internal.h docking
commit 84f3ecc231a737b9ed31423106d502c5dae016af 2 parents cc48f1e + 42c98c5 omar authored on 30 May 2019

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View imgui.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