ocornut e4233c6fb6 Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend) ... # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx10.h # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx11.h # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx12.h # backends/imgui_impl_dx9.cpp # backends/imgui_impl_dx9.h # backends/imgui_impl_glfw.cpp # backends/imgui_impl_metal.h # backends/imgui_impl_metal.mm # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_opengl3.h # backends/imgui_impl_osx.h # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdlrenderer.cpp # backends/imgui_impl_sdlrenderer.h # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt # imgui.cpp # imgui_widgets.cpp		2023-02-07 16:23:49 +01:00
..
build_win32.bat	Backends+Examples: SDL2: renamed imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h. (#6146)	2023-02-07 12:04:38 +01:00
example_sdl2_directx11.vcxproj	Backends+Examples: SDL2: renamed imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h. (#6146)	2023-02-07 12:04:38 +01:00
example_sdl2_directx11.vcxproj.filters	Backends+Examples: SDL2: renamed imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h. (#6146)	2023-02-07 12:04:38 +01:00
main.cpp	Merge branch 'master' into docking (doesn't include viewports-related changes for new SDL3 backend)	2023-02-07 16:23:49 +01:00