Browse code Merge branch 'master' into viewport # Conflicts: # imgui.cpp docking
commit d87b80c6c1deba49f79bee733573530b7f18f4de 2 parents dcbf976 + da3c433 omar authored on 22 Nov 2018

Showing 12 changed files

• docs/CHANGELOG.txt
• docs/README.md
• examples/example_sdl_vulkan/main.cpp
• examples/imgui_impl_opengl3.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/README.txt
• misc/cpp/README.txt

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

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

Ignore Space Show notes View examples/imgui_impl_opengl3.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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/README.txt

Ignore Space Show notes View misc/cpp/README.txt 0 → 100644

Show line notes below