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 996eb080fa075c6e7da4e6e1a85ae394d2854da8 2 parents 1ef7980 + 6eb35b8 ocornut authored on 11 Aug 2016

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View README.md

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 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_textedit.h

Show line notes below