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 a608156da3bbc284868432fc3f0125a8d5e456cb 2 parents 65a2350 + 52a9f8b omar authored on 1 Feb 2019

Patch

Unified Split

Showing 1 changed file

Ignore Space Show notes View imgui.h

Show line notes below