ocornut aec062a8a5 Merge branch 'master' into docking ... # Conflicts: # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # docs/CHANGELOG.txt # examples/example_win32_directx9/main.cpp # imgui_internal.h		2023-04-11 16:16:17 +02:00
..
example_glut_opengl2.vcxproj	Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)	2023-03-15 17:09:09 +01:00
example_glut_opengl2.vcxproj.filters	Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)	2023-03-15 17:09:09 +01:00
main.cpp	Merge branch 'master' into docking	2023-04-11 16:16:17 +02:00
Makefile	CI: Fixes for OSX + explicitely request C++11.	2022-02-15 17:25:11 +01:00