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
..
CMakeLists.txt example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036) 7 years ago
build_win32.bat Examples: Renamed example folders. (#1870) 7 years ago
build_win64.bat Examples: Renamed example folders. (#1870) 7 years ago
example_glfw_vulkan.vcxproj example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036) 7 years ago
example_glfw_vulkan.vcxproj.filters example_glfw_vulkan was missing a reference to imgui_widgets.cpp (#2071, #2036) 7 years ago
gen_spv.sh Examples: Renamed example folders. (#1870) 7 years ago
glsl_shader.frag Examples: Renamed example folders. (#1870) 7 years ago
glsl_shader.vert Examples: Renamed example folders. (#1870) 7 years ago
main.cpp Merge branch 'master' into viewport 6 years ago