Merge branch 'master' into docking + amends change to nullptr (#5760)

Browse Source

# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
#	imgui_internal.h

...

This commit is contained in:

ocornut

2022-10-11 15:59:23 +02:00

parent cb04326b46 c54230d14e

commit edf522b58a

24 changed files with 513 additions and 494 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

backends/imgui_impl_win32.cpp

+38 -37

File diff suppressed because it is too large Load Diff