Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar

2020-05-08 17:07:40 +02:00

parent 538d28e29e 4f33dd15c4

commit 8596f2b0fc

2 changed files with 408 additions and 347 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

741

imgui_internal.h

File diff suppressed because it is too large Load Diff