ocornut 34debc733f Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_vulkan.cpp
#	imgui.h

2025-07-27 20:35:25 +09:00

..

sdlgpu3

…

vulkan

…

imgui_impl_allegro5.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_allegro5.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_android.cpp

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_android.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_dx9.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_dx9.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx10.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_dx10.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_dx11.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_dx12.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_glfw.cpp

Merge branch 'master' into docking

2025-07-08 17:25:22 +02:00

imgui_impl_glfw.h

Merge branch 'master' into docking

2025-06-18 16:55:20 +02:00

imgui_impl_glut.cpp

…

imgui_impl_glut.h

…

imgui_impl_metal.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_metal.mm

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_opengl2.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_opengl3_loader.h

Backends: OpenGL3: add and call embedded loader shutdown in ImGui_ImplOpenGL3_Shutdown(). (#8792)

2025-07-22 16:46:35 +09:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_opengl3.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_osx.h

Merge branch 'master' into docking

2025-06-27 16:59:03 +02:00

imgui_impl_osx.mm

Backends: OSX: Fixed multi-viewport handling broken in 1.92.0. (#8644, #8777)

2025-07-08 13:38:37 +02:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2025-07-08 17:25:22 +02:00

imgui_impl_sdl2.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2025-06-27 16:59:03 +02:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00

imgui_impl_sdlgpu3_shaders.h

…

imgui_impl_sdlgpu3.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_sdlgpu3.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2025-06-11 19:04:44 +02:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2025-07-27 20:35:25 +09:00

imgui_impl_vulkan.h

Merge branch 'master_fonts' into docking

2025-06-11 18:07:19 +02:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2025-07-22 18:38:50 +09:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2025-06-13 17:43:30 +02:00

imgui_impl_win32.cpp

Merge branch 'master' into docking

2025-06-20 15:19:36 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

2025-03-30 16:42:28 +02:00