Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 6b4f6cd2c5340f08e8caa1caf6d8f7efe69a5b73 2 parents 1b646a4 + dd0d5de omar authored on 26 Jul 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View imconfig.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below