ocornut 1dc7d0e633 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp

2022-09-26 11:08:49 +02: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

Examples: Vulkan: Add c++ version to CMakeLists (#5459)

2022-07-10 18:22:46 +02: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

Examples: updated VS projects with .natvis file under imgui/

2022-09-14 14:17:47 +02:00

main.cpp

Merge branch 'master' into docking

2022-09-26 11:08:49 +02:00