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 3e0d6ec895 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
3 years ago
..
CMakeLists.txt Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914) 3 years ago
build_win32.bat Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914) 3 years ago
build_win64.bat Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914) 3 years ago
example_glfw_vulkan.vcxproj Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914) 3 years ago
example_glfw_vulkan.vcxproj.filters Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis' 4 years ago
main.cpp Merge branch 'master' into docking 3 years ago