Browse code Merge branch 'master' into viewport # Conflicts: # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui.h # imgui_draw.cpp # imgui_internal.h docking
commit 88df66ec83b7b7f6f80ac4e51e00d0d01e2c8953 2 parents ce18371 + 2328854 omar authored on 12 Jul 2018

Showing 11 changed files

• CHANGELOG.txt
• examples/example_glfw_opengl2/main.cpp
• examples/example_glfw_opengl3/main.cpp
• examples/example_sdl_opengl3/main.cpp
• examples/imgui_impl_opengl2.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_opengl3.h
• imgui.cpp
• imgui.h
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View CHANGELOG.txt

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_opengl3/main.cpp

Ignore Space Show notes View examples/imgui_impl_opengl2.cpp

Ignore Space Show notes View examples/imgui_impl_opengl3.cpp

Ignore Space Show notes View examples/imgui_impl_opengl3.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below