Browse code Merge branch 'master' into viewport # Conflicts: # examples/example_glfw_opengl3/main.cpp # examples/imgui_impl_opengl3.cpp # imgui.cpp # imgui_internal.h docking
commit 36b2f64051b82978c59ae349b8a2ee7c7a946516 2 parents 705ff49 + 1c4008a omar authored on 29 Aug 2018

Showing 16 changed files

• .travis.yml
• CHANGELOG.txt
• examples/example_glfw_opengl3/Makefile
• examples/example_glfw_opengl3/main.cpp
• examples/example_sdl_opengl3/Makefile
• examples/example_sdl_opengl3/main.cpp
• examples/imgui_impl_opengl3.cpp
• examples/imgui_impl_opengl3.h
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_vulkan.h
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• misc/fonts/README.txt

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View examples/example_glfw_opengl3/Makefile

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

Ignore Space Show notes View examples/example_sdl_opengl3/Makefile

Ignore Space Show notes View examples/example_sdl_opengl3/main.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 examples/imgui_impl_vulkan.cpp

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