ocornut 9937660b1c Merge branch 'master' into docking ... # Conflicts: # examples/example_allegro5/main.cpp # examples/example_apple_metal/main.mm # examples/example_apple_opengl2/main.mm # examples/example_glfw_metal/main.mm # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_glut_opengl2/main.cpp # examples/example_sdl2_directx11/main.cpp # examples/example_sdl2_metal/main.mm # examples/example_sdl2_opengl2/main.cpp # examples/example_sdl2_opengl3/main.cpp # examples/example_sdl2_vulkan/main.cpp # examples/example_sdl3_opengl3/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # examples/example_win32_directx9/main.cpp # imgui.cpp		2023-03-10 18:40:04 +01:00
..
main.mm	Merge branch 'master' into docking	2023-03-10 18:40:04 +01:00
Makefile	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00