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

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_glfw.h
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_sdl.h
#	backends/imgui_impl_win32.cpp
#	backends/imgui_impl_win32.h
#	imgui.cpp

2022-01-10 15:24:21 +01: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

2022-01-10 15:24:21 +01:00