ocornut ea4565368e Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl2.h # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_sdl3.h # imgui.cpp		2023-02-10 17:05:06 +01:00
..
main.mm	Merge branch 'master' into docking	2023-02-10 17:05:06 +01:00
Makefile	Backends+Examples: SDL2: renamed imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h. (#6146)	2023-02-07 12:04:38 +01:00