ocornut 8add6bcb9f Merge remote-tracking branch 'origin/master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h

2023-12-14 17:21:15 +01:00

..

vulkan

Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft)

2020-10-14 14:41:40 +02:00

imgui_impl_allegro5.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_allegro5.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_android.cpp

Merge remote-tracking branch 'origin/master' into docking

2023-12-14 17:21:15 +01:00

imgui_impl_android.h

Merge branch 'master' into docking

2023-11-28 14:39:46 +01:00

imgui_impl_dx9.cpp

Backends: DX9: Fixed incorrect assert triggering on reopening session with minimized windows. (#3424)

2023-10-02 15:28:22 +02:00

imgui_impl_dx9.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_dx10.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_dx10.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_dx11.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_dx11.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_dx12.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_dx12.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_glfw.cpp

Merge branch 'master' into docking

2023-10-12 19:22:36 +02:00

imgui_impl_glfw.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_glut.cpp

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_glut.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_metal.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_metal.mm

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_opengl3_loader.h

Backends: OpenGL3: imgui_impl_opengl3_loader.h: change #define ARRAY_SIZE to GL3W_ARRAY_SIZE to avoid external conflicts (#7017, #7018)

2023-11-16 01:38:47 +01:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_osx.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_osx.mm

Merge branch 'master' into docking

2023-10-12 19:22:36 +02:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2023-10-12 19:22:36 +02:00

imgui_impl_sdl2.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2023-12-05 12:20:16 +01:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2023-12-05 12:20:16 +01:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking

2023-11-10 14:56:10 +01:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00

imgui_impl_win32.cpp

Merge branch 'master' into docking

2023-10-12 19:22:36 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

2023-09-16 13:51:51 +02:00