Merge branch 'master' into viewport

# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_vulkan.cpp
This commit is contained in:
omar
2018-09-14 11:32:55 +02:00
52 changed files with 99 additions and 100 deletions

View File

@ -1,4 +1,4 @@
// ImGui Renderer for: Vulkan
// dear imgui: Renderer for Vulkan
// This needs to be used along with a Platform Binding (e.g. GLFW, SDL, Win32, custom..)
// Missing features: