Merge branch 'master' into docking

Browse Source

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp

...

This commit is contained in:

ocornut

2020-08-17 23:26:56 +02:00

parent a9626e1162 3c65b650e8

commit 25a9209b75

12 changed files with 713 additions and 373 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

644

imgui_widgets.cpp

File diff suppressed because it is too large Load Diff