You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
omar 8079344cee Merge branch 'master' into viewport
# Conflicts:
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_sdl.cpp
#	examples/imgui_impl_vulkan.h
#	imgui.cpp
6 years ago
..
example_sdl_vulkan.vcxproj Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036) 7 years ago
example_sdl_vulkan.vcxproj.filters Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036) 7 years ago
main.cpp Merge branch 'master' into viewport 6 years ago