Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h

...

This commit is contained in:

omar

2018-05-17 15:03:56 +02:00

parent 4c35e00f49 64b1645deb

commit 01429e7d16

11 changed files with 473 additions and 374 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

438

imgui.cpp

File diff suppressed because it is too large Load Diff