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

# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.h
#	backends/imgui_impl_osx.mm
#	imgui.cpp

2021-12-15 12:10:03 +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

2021-12-15 12:10:03 +01:00