Merge branch 'martty-master'

Fork: 0

mark / imgui

Browse code Merge branch 'martty-master' docking features/draw_callback_extra_arg features/fnv1a features/imvector_size_t features/premake features/range_select features/tex_round_corners master v1.67-fixes v1.71 v1.70 v1.69 v1.68 v1.67 v1.66b v1.66 v1.65 v1.64 v1.63 v1.62 v1.61 v1.60 v1.53 v1.52 v1.51 v1.50
commit 2973287fd310b818e7e935d7b1674c72f5c66740 2 parents 98e1d50 + 55863dd ocornut authored on 12 Nov 2016

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View examples/vulkan_example/gen_spv.sh

Ignore Space Show notes View examples/vulkan_example/glsl_shader.frag

Ignore Space Show notes View examples/vulkan_example/glsl_shader.vert

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.cpp

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.h

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

Show line notes below