Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_internal.h

...

This commit is contained in:

omar

2018-08-29 17:40:52 +02:00

parent 705ff49400 1c4008aa97

commit 36b2f64051

16 changed files with 522 additions and 393 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

+80 -107

File diff suppressed because it is too large Load Diff