Browse code Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui_internal.h 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 5c4fda0fbce83424b3b82160f6b3cbf93ee967fa 2 parents 1a62d46 + 2169bf6 omar authored on 6 Sep 2017

Showing 22 changed files

• TODO.txt
• examples/allegro5_example/main.cpp
• examples/apple_example/imguiex-ios/debug_hud.cpp
• examples/directx10_example/main.cpp
• examples/directx11_example/main.cpp
• examples/directx9_example/main.cpp
• examples/marmalade_example/main.cpp
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl2_example/imgui_impl_glfw.h
• examples/opengl2_example/main.cpp
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/main.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl2_example/imgui_impl_sdl.h
• examples/sdl_opengl2_example/main.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl3_example/main.cpp
• examples/vulkan_example/main.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h

Ignore Space Show notes View TODO.txt

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

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.cpp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View examples/vulkan_example/main.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_internal.h

Show line notes below