ocornut 1dc7d0e633 Merge branch 'master' into docking ...

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

2022-09-26 11:08:49 +02:00

..

main.mm

Merge branch 'master' into docking

2022-09-26 11:08:49 +02:00

Makefile

CI: Fixes for OSX + explicitely request C++11.

2022-02-15 17:25:11 +01:00