Merge remote-tracking branch 'origin' into 2016-02-colorpicker

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' 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 404979e48d2f6bbdbe3ce0d372e7d84d348b2d8d 2 parents 1b5bbf7 + e07d457 ocornut authored on 7 Oct 2016

Patch

Unified Split

Showing 9 changed files

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

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

Ignore Space Show notes View extra_fonts/binary_to_compressed_c.cpp

Ignore Space Show notes View imconfig.h

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