Browse code Merge branch 'master' into viewport # Conflicts: # examples/opengl3_example/imgui_impl_glfw_gl3.cpp # examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp # imgui.cpp # imgui.h docking
commit 01429e7d16cd9b62eab6e3243e9ba346f0b6d045 2 parents 4c35e00 + 64b1645 omar authored on 17 May 2018

Showing 11 changed files

• .github/issue_template.md
• CHANGELOG.txt
• TODO.txt
• examples/imgui_impl_opengl3.cpp
• imconfig.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/fonts/README.txt

Ignore Space Show notes View .github/issue_template.md

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View imconfig.h

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 misc/fonts/README.txt

Show line notes below