ocornut dee5bf3ec3 Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_vulkan.cpp
#	imgui.cpp

2026-04-23 16:07:01 +02:00

..

example_glut_opengl2.vcxproj

Update VS toolset in all .vcxproj from VS2015 (v140) to VS2017 (v141).

2026-04-23 15:58:04 +02: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

2026-02-12 20:08:03 +01:00

Makefile

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

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