ocornut 0b06c4b2b0 Merge branch 'master' into docking (will need further for io.AddFocusEvent) ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp

2021-08-19 17:25:12 +02:00

..

example_apple_opengl2.xcodeproj

Backends: OpenGL3: Embed our own minimal GL loader (amends). (#4445)

2021-08-19 16:24:59 +02:00

main.mm

Merge branch 'features/backends_context' into docking

2021-06-29 14:53:25 +02:00