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