ocornut 7e246a7bb9 Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui_internal.h		2023-09-16 13:51:51 +02:00
..
main.mm	Merge branch 'master' into docking	2023-09-16 13:51:51 +02:00
Makefile	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00