Merge remote-tracking branch 'origin' into 2016-02-colorpicker

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2016-02-colorpicker 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
commit ef10b984feddc27fbc84fb325010f417c4a3e7a8 2 parents cff815f + 63d47bc ocornut authored on 23 Aug 2016

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View examples/.gitignore

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

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

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_demo.cpp

Show line notes below