Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit 14cef31467b97b3978ae6bf16143cde200c4c0fb 2 parents 6277781 + 0708f91 omar authored on 9 Jul 2018

Showing 11 changed files

• CHANGELOG.txt
• TODO.txt
• examples/example_glfw_opengl3/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/example_glfw_opengl3/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_opengl3.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

Show line notes below