Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
#	imgui.cpp
#	imgui.h

...

This commit is contained in:

omar

2018-05-11 22:22:41 +02:00

parent 090eb437ed fc7fc83f9e

commit 85f3ba844c

8 changed files with 760 additions and 566 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

1062

imgui.cpp

File diff suppressed because it is too large Load Diff