Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h docking
commit 5f8c9ae0efd17afcd9e39cc0cc0df3c51e994285 2 parents 8b95621 + 056af2b omar authored on 18 Oct 2018

Showing 12 changed files

• docs/CHANGELOG.txt
• docs/README.md
• examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj
• examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj
• examples/imgui_impl_sdl.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/README.txt

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/README.txt

Show line notes below