Merge branch 'Loftilus-master'

Fork: 0

mark / imgui

Browse code Merge branch 'Loftilus-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 v1.49 v1.48
commit 26be1511e91d69b0c2159b3751c7bf81314f0bed 2 parents f45fd1c + c1427de ocornut authored on 3 Apr 2016

Patch

Unified Split

Showing 13 changed files

Ignore Space Show notes View examples/README.txt

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3.h

Ignore Space Show notes View examples/libs/glfw/include/GLFW/glfw3native.h

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-32/glfw3.lib
Not supported

Ignore Space Show notes View examples/libs/glfw/lib-vc2010-64/glfw3.lib
Not supported

Ignore Space Show notes View examples/vulkan_example/CMakeLists.txt 0 → 100644

Ignore Space Show notes View examples/vulkan_example/build_win32.bat 0 → 100644

Ignore Space Show notes View examples/vulkan_example/gen_spv.sh 0 → 100755

Ignore Space Show notes View examples/vulkan_example/glsl_shader.frag 0 → 100644

Ignore Space Show notes View examples/vulkan_example/glsl_shader.vert 0 → 100644

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.cpp 0 → 100644

Ignore Space Show notes View examples/vulkan_example/imgui_impl_glfw_vulkan.h 0 → 100644

Ignore Space Show notes View examples/vulkan_example/main.cpp 0 → 100644

Show line notes below