Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_sdl.cpp docking
commit 951c9dd68bf640cc6274eafcccb47ae7946cb08d 2 parents a71d3c8 + d9a4cbc omar authored on 2 Jan 2019

Showing 13 changed files

• .github/CONTRIBUTING.md
• .github/issue_template.md
• .github/pull_request_template.md
• LICENSE.txt
• docs/CHANGELOG.txt
• docs/README.md
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_sdl.cpp
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• 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/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_widgets.cpp

Show line notes below