Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_vulkan.cpp docking
commit 50ceb25003bcca4d6a9e01c3e089fbbf2dc2758b 2 parents 43a85dd + ccca76f omar authored on 7 Apr 2019

Showing 13 changed files

• docs/CHANGELOG.txt
• docs/README.md
• docs/issue_template.md
• examples/example_glfw_vulkan/main.cpp
• examples/example_sdl_vulkan/main.cpp
• examples/imgui_impl_vulkan.cpp
• examples/imgui_impl_vulkan.h
• imgui.cpp
• imgui.h
• imgui_draw.cpp
• imgui_widgets.cpp
• misc/freetype/imgui_freetype.cpp
• misc/freetype/imgui_freetype.h

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View docs/README.md

Ignore Space Show notes View docs/issue_template.md

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

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

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_draw.cpp

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Ignore Space Show notes View misc/freetype/imgui_freetype.h

Show line notes below