Merge branch 'master' into 2016-02-colorpicker

Fork: 0

mark / imgui

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 459af7683cb1dbcfa937093096ae02c105b80a3f 2 parents a43a9e6 + 3db4090 ocornut authored on 4 Mar 2016

Patch

Unified Split

Showing 4 changed files

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

Show line notes below