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

Examples: Fix batch files (amend b1a18d82, #3513), standardize them + DirectX12: Move ImGui::Render() call above the first barrier to clarify its lack of effect on the graphics pipe.

2020-12-09 18:28:02 +01:00

example_win32_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_win32_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