ocornut 66e08b6575 Merge branch 'master' into docking (require next commit) ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	imgui.cpp

2026-01-14 19:42:11 +01:00

..

build_win32.bat

Examples: added SDL3+Vulkan example. (#8084, #8085)

2024-10-24 18:09:27 +02:00

build_win64.bat

Examples: added SDL3+Vulkan example. (#8084, #8085)

2024-10-24 18:09:27 +02:00

example_sdl3_vulkan.vcxproj

Revert "Examples: Updated all .vcxproj from VS2015 to VS2019 (toolset v140 to v142), Windows SDK 8.1 to 10."

2025-03-11 18:42:12 +01:00

example_sdl3_vulkan.vcxproj.filters

Examples: added SDL3+Vulkan example. (#8084, #8085)

2024-10-24 18:09:27 +02:00

main.cpp

Merge branch 'master' into docking (require next commit)

2026-01-14 19:42:11 +01:00

Makefile

Examples: added SDL2+Vulkan, SDL3+Vulkan, GLFW+Vulkan makefiles. Amend ignore list. (#2480)

2025-04-16 15:04:14 +02:00