Merge branch 'master' into viewport

Fork: 0

mark / imgui

Browse code Merge branch 'master' into viewport # Conflicts: # imgui.h docking
commit bcf4ed28a9394cbe4f84228d56b67a404671c024 2 parents 6cfc9e6 + d8d93f6 omar authored on 18 Mar 2018

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View imconfig.h

Ignore Space Show notes View imgui.h

Show line notes below