Merge branch 'master' into docking

Fork: 0

mark / imgui

Browse code Merge branch 'master' into docking # Conflicts: # imgui_demo.cpp docking
commit 328e4fa7e74a20d46eef8e8e53de1f50d6c651ad 2 parents f3110a5 + 07a70dc omar authored on 11 Apr 2019

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View examples/.gitignore

Ignore Space Show notes View examples/example_null/Makefile 0 → 100644

Ignore Space Show notes View examples/example_null/main.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below