ocornut 7e246a7bb9 Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h		2023-09-16 13:51:51 +02:00
..
main.mm	Merge branch 'master' into docking	2023-09-16 13:51:51 +02: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