Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_vulkan.h # imgui.cpp docking
commit a4191857c1cb5a8611ffd1a97ddccdfb51fbe99b 2 parents 9d74807 + 7011d87 omar authored on 22 Aug 2018

Showing 15 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• .github/pull_request_template.md
• CHANGELOG.txt
• README.md
• TODO.txt
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_vulkan.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/stl/imgui_stl.cpp
• misc/stl/imgui_stl.h

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View .github/pull_request_template.md

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View README.md

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/imgui_impl_vulkan.cpp

Ignore Space Show notes View examples/imgui_impl_vulkan.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View misc/stl/imgui_stl.cpp 0 → 100644

Ignore Space Show notes View misc/stl/imgui_stl.h 0 → 100644

Show line notes below