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

...

This commit is contained in:

omar

2018-06-05 15:51:52 +02:00

parent 03c8a78f04 6d98c0323b

commit 93b032ea92

8 changed files with 363 additions and 142 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

+274 -88

File diff suppressed because it is too large Load Diff