4 Commits (6277781e837e7419686866a03e68a7d0e7eb85b0)

Author SHA1 Message Date
omar ce500f8727 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
7 years ago
omar d68633398b Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings. 7 years ago
omar 9660657e95 Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_sdl.cpp
7 years ago
omar 8d58fbb5ed Examples: Renamed example folders. (#1870) 7 years ago