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 66b2ee6ea2c6ca89d45493e61e55f66a3e4c08d3 2 parents 29c194b + a344902 omar authored on 7 Jan 2018

Showing 17 changed files

• examples/allegro5_example/imgui_impl_a5.cpp
• examples/apple_example/imguiex-ios/imgui_impl_ios.mm
• examples/directx10_example/directx10_example.vcxproj
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx11_example/directx11_example.vcxproj
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/opengl2_example/imgui_impl_glfw.cpp
• examples/opengl2_example/opengl2_example.vcxproj
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl3_example/opengl3_example.vcxproj
• examples/sdl_opengl2_example/imgui_impl_sdl.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• imgui.cpp
• imgui.h
• imgui_draw.cpp

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/directx10_example/directx10_example.vcxproj

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

Ignore Space Show notes View examples/directx11_example/directx11_example.vcxproj

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

Ignore Space Show notes View examples/directx9_example/directx9_example.vcxproj

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

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

Ignore Space Show notes View examples/opengl2_example/opengl2_example.vcxproj

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

Ignore Space Show notes View examples/opengl3_example/opengl3_example.vcxproj

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 imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_draw.cpp

Show line notes below