Merge branch 'master' into docking

Browse Source

# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp

...

This commit is contained in:

ocornut

2023-09-26 11:37:38 +02:00

parent c418685315 94da5842ef

commit bb2fb74645

9 changed files with 216 additions and 200 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

imgui.cpp

+130 -127

File diff suppressed because it is too large Load Diff