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 3ddb50a925fe3ec068bd70b969081b18d0bc98fd 2 parents 6bcc31e + 0fb51b6 ocornut authored on 29 May 2016

Showing 21 changed files

• README.md
• examples/README.txt
• examples/directx10_example/imgui_impl_dx10.cpp
• examples/directx10_example/main.cpp
• examples/directx11_example/imgui_impl_dx11.cpp
• examples/directx11_example/main.cpp
• examples/directx9_example/build_win32.bat
• examples/directx9_example/directx9_example.vcxproj
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/directx9_example/main.cpp
• examples/opengl3_example/imgui_impl_glfw_gl3.cpp
• examples/opengl_example/imgui_impl_glfw.cpp
• examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
• examples/sdl_opengl_example/imgui_impl_sdl.cpp
• extra_fonts/README.txt
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h
• stb_rect_pack.h

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/README.txt

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

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

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

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

Ignore Space Show notes View examples/directx9_example/build_win32.bat

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/directx9_example/main.cpp

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

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

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

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

Ignore Space Show notes View extra_fonts/README.txt

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

Ignore Space Show notes View stb_rect_pack.h

Show line notes below