ocornut 4f692ba840 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt

2023-04-19 16:35:50 +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-19 16:35:50 +02:00

Makefile

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

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