ocornut aec062a8a5 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl2.cpp
#	backends/imgui_impl_sdl3.cpp
#	docs/CHANGELOG.txt
#	examples/example_win32_directx9/main.cpp
#	imgui_internal.h

2023-04-11 16:16:17 +02:00

..

example_apple_opengl2.xcodeproj

Backends: OSX: Add Game Controller support. (#4759)

2021-12-13 11:25:59 +01:00

main.mm

Merge branch 'master' into docking

2023-04-11 16:16:17 +02:00