ocornut 6b3435a2db Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt

2023-03-16 12:01:13 +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

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

2022-07-10 18:22:46 +02:00

example_glfw_vulkan.vcxproj

Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)

2023-03-15 17:09:09 +01:00

example_glfw_vulkan.vcxproj.filters

Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)

2023-03-15 17:09:09 +01:00

main.cpp

Merge branch 'master' into docking

2023-03-10 18:40:04 +01:00