Browse code Merge branch 'master' 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 dd6163241c031cdd02faa8e9b81fe2bfd76828f0 2 parents 404979e + b3790e7 ocornut authored on 16 Oct 2016

Showing 13 changed files

• examples/allegro5_example/imgui_impl_a5.cpp
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/marmalade_example/imgui_impl_marmalade.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_draw.cpp
• imgui_internal.h
• stb_textedit.h

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

Ignore Space Show notes View examples/apple_example/imguiex-ios/imgui_impl_ios.mm

Ignore Space Show notes View examples/marmalade_example/imgui_impl_marmalade.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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View stb_textedit.h

Show line notes below