Browse code Merge branch 'viewport' into docking # Conflicts: # imgui.cpp # imgui.h # imgui_internal.h docking
commit ce1626a51e9fe22512227abb3429f3d9c46e47d4 2 parents 0d6e3ab + 0cabe4d omar authored on 2 Jan 2019

Showing 18 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• .github/pull_request_template.md
• LICENSE.txt
• docs/CHANGELOG.txt
• docs/README.md
• examples/example_glfw_opengl2/main.cpp
• examples/example_glfw_opengl3/main.cpp
• examples/example_sdl_opengl2/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h
• imgui_widgets.cpp

Ignore Space Show notes View .github/CONTRIBUTING.md

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View .github/pull_request_template.md

Ignore Space Show notes View LICENSE.txt

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View examples/example_glfw_opengl2/main.cpp

Ignore Space Show notes View examples/example_glfw_opengl3/main.cpp

Ignore Space Show notes View examples/example_sdl_opengl2/main.cpp

Ignore Space Show notes View examples/example_sdl_opengl3/main.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_sdl.cpp

Ignore Space Show notes View examples/imgui_impl_win32.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_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Show line notes below