Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)
commit f6fc28dfd21529e4d38bbc28e85f995a805ef2a0
2 parents cdeef65 + 111ea7a
@omar omar authored on 12 Mar 2018
Showing 13 changed files
View
.github/CONTRIBUTING.md
View
.github/issue_template.md
View
.github/pull_request_template.md 0 → 100644
View
CHANGELOG.txt
View
TODO.txt
View
examples/vulkan_example/main.cpp
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
imgui_internal.h
View
misc/freetype/README.md
View
misc/freetype/imgui_freetype.cpp