ocornut 6b3435a2db Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt

2023-03-16 12:01:13 +01:00

..

build_win32.bat

Backends+Examples: SDL2: renamed imgui_impl_sdl.cpp/.h to imgui_impl_sdl2.cpp/.h. (#6146)

2023-02-07 12:04:38 +01:00

example_sdl2_directx11.vcxproj

Examples: Windows: Added 'misc/debuggers/imgui.natstepfilter' file to all Visual Studio projects. (#3038)

2023-03-15 17:09:09 +01:00

example_sdl2_directx11.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-03-10 18:40:04 +01:00