Merge branch 'master' into docking

Browse Source

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

...

This commit is contained in:

ocornut

2020-12-04 19:22:15 +01:00

parent 657589ab47 9874077fc0

commit dd4ca70b0d

49 changed files with 6384 additions and 575 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

1857

imgui_demo.cpp

File diff suppressed because it is too large Load Diff