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

2022-01-21 12:39:15 +01:00

..

build_win32.bat

Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914)

2022-01-20 15:53:28 +01:00

build_win64.bat

Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914)

2022-01-20 15:53:28 +01:00

CMakeLists.txt

Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914)

2022-01-20 15:53:28 +01:00

example_glfw_vulkan.vcxproj

Backends: Vulkan: Added support for ImTextureID as VkDescriptorSet, amends. (#914)

2022-01-20 15:53:28 +01:00

example_glfw_vulkan.vcxproj.filters

Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'

2021-03-11 16:21:46 +01:00

main.cpp

Merge branch 'master' into docking

2022-01-17 18:19:20 +01:00