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
..
2023-02-07 13:22:23 +01:00
2022-09-26 10:43:26 +02:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-03 22:38:39 +01:00
2023-02-01 19:43:03 +01:00
2023-02-01 19:43:03 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 13:22:23 +01:00
2023-01-03 21:06:09 +01:00
2022-09-05 15:58:31 +02:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 13:22:23 +01:00
2023-02-07 13:22:23 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:07:53 +01:00
2023-02-07 16:07:53 +01:00
2023-02-07 13:22:23 +01:00
2023-02-07 13:22:23 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 16:23:49 +01:00
2023-02-07 13:22:23 +01:00
2023-02-07 13:22:23 +01:00
2023-02-07 13:22:23 +01:00
2022-12-01 20:22:27 +01:00