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.
ocornut e9053515bb Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
4 years ago
..
CMakeLists.txt
build_win32.bat
build_win64.bat
example_glfw_vulkan.vcxproj
example_glfw_vulkan.vcxproj.filters
gen_spv.sh
glsl_shader.frag
glsl_shader.vert
main.cpp Merge branch 'master' into docking 4 years ago