Merge branch 'master' into docking (enable range

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking (enable range_select merge) # Conflicts: # imgui.cpp # imgui_internal.h docking
commit d1c45c0d76ad7f0bfd0b6602cb13d68de9ec481d 2 parents e30babe + 5cb7040 omar authored on 1 Feb 2019

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below