Merge branch 'master' into docking

Browse source

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

...

This commit is contained in:

ocornut 2020-10-31 00:47:17 +01:00

parent 455c21df71 047d4c4500

commit e3ac52630a

25 changed files with 1018 additions and 1062 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

988

imgui.cpp

View file

File diff suppressed because it is too large Load diff