ocornut 682447306d Merge branch 'features/backends_context' into docking ...

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
#	examples/example_apple_opengl2/main.mm

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

..

example_apple_opengl2.xcodeproj

Tables: Add empty file, skeleton.

2020-12-04 19:15:19 +01:00

main.mm

Merge branch 'features/backends_context' into docking

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