ocornut 3f61da7e8b Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	backends/imgui_impl_sdl3.h
#	imgui.cpp
#	imgui.h
#	imgui_internal.h

2024-07-02 17:48:38 +02: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

2024-07-01 17:10:12 +02:00

imgui_impl_allegro5.h

Merge branch 'master' into docking

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

imgui_impl_android.cpp

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02:00

imgui_impl_android.h

Merge branch 'master' into docking

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

imgui_impl_dx9.cpp

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +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 (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02: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 (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02: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 (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02:00

imgui_impl_dx12.h

Merge branch 'master' into docking

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

imgui_impl_glfw.cpp

Viewports: Backported 'void* ImGuiViewport::PlatformHandle' from docking branch for use by backends.

2024-06-26 14:32:48 +02:00

imgui_impl_glfw.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_glut.cpp

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +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 (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02:00

imgui_impl_opengl2.cpp

Merge branch 'master' into docking

2024-06-28 16:03:49 +02:00

imgui_impl_opengl2.h

Merge branch 'master' into docking

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

imgui_impl_opengl3_loader.h

Fixed typos. (#7593)

2024-05-16 16:13:01 +02:00

imgui_impl_opengl3.cpp

Merge branch 'master' into docking

2024-06-28 16:03:49 +02:00

imgui_impl_opengl3.h

Merge branch 'master' into docking

2024-04-30 10:42:46 +02:00

imgui_impl_osx.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_osx.mm

Merge branch 'master' into docking

2024-07-02 17:48:38 +02:00

imgui_impl_sdl2.cpp

Merge branch 'master' into docking

2024-07-02 17:48:38 +02:00

imgui_impl_sdl2.h

Backends: comments.

2024-02-28 11:06:40 +01:00

imgui_impl_sdl3.cpp

Merge branch 'master' into docking

2024-07-02 17:48:38 +02:00

imgui_impl_sdl3.h

Merge branch 'master' into docking

2024-07-02 17:48:38 +02:00

imgui_impl_sdlrenderer2.cpp

Merge branch 'master' into docking

2024-05-16 19:57:04 +02:00

imgui_impl_sdlrenderer2.h

Merge branch 'master' into docking

2024-05-16 19:57:04 +02:00

imgui_impl_sdlrenderer3.cpp

Merge branch 'master' into docking

2024-07-01 17:10:12 +02:00

imgui_impl_sdlrenderer3.h

Merge branch 'master' into docking

2024-05-16 19:57:04 +02:00

imgui_impl_vulkan.cpp

Merge branch 'master' into docking

2024-05-16 19:57:04 +02:00

imgui_impl_vulkan.h

Merge branch 'master' into docking

2024-06-26 14:54:01 +02:00

imgui_impl_wgpu.cpp

Merge branch 'master' into docking (incl merge moved CurrentDpiScale field)

2024-05-14 16:29:06 +02:00

imgui_impl_wgpu.h

Merge branch 'master' into docking

2024-04-11 16:21:56 +02:00

imgui_impl_win32.cpp

Merge branch 'master' into docking

2024-06-28 16:03:49 +02:00

imgui_impl_win32.h

Merge branch 'master' into docking

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