Browse code Merge branch 'master' into navigation # Conflicts: # imgui.cpp 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
commit 807322c9a559624227efa4f69e3010ea4ba4c3f0 2 parents e6ed2f9 + b295e18 omar authored on 26 Aug 2017

Showing 12 changed files

• LICENSE.txt
• examples/allegro5_example/imgui_impl_a5.cpp
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View LICENSE.txt

Ignore Space Show notes View examples/allegro5_example/imgui_impl_a5.cpp

Ignore Space Show notes View examples/opengl2_example/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/opengl3_example/imgui_impl_glfw_gl3.cpp

Ignore Space Show notes View examples/sdl_opengl2_example/imgui_impl_sdl.cpp

Ignore Space Show notes View examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp

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

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

Show line notes below