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 6bcc31e575ce48fc1bf323087e7f02560d7dd0a2 2 parents 074a685 + ea6b615 ocornut authored on 26 Apr 2016

Showing 12 changed files

• README.md
• examples/apple_example/imguiex.xcodeproj/project.pbxproj
• examples/directx9_example/imgui_impl_dx9.cpp
• examples/opengl_example/imgui_impl_glfw.cpp
• examples/opengl_example/imgui_impl_glfw.h
• examples/sdl_opengl3_example/main.cpp
• examples/sdl_opengl_example/main.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_draw.cpp
• imgui_internal.h

Ignore Space Show notes View README.md

Ignore Space Show notes View examples/apple_example/imguiex.xcodeproj/project.pbxproj

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

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

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

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

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

Ignore Space Show notes View imgui_internal.h

Show line notes below