Merge remote-tracking branch 'origin' into 2016-07-navigation

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2016-07-navigation 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
commit f72e2fd1b18ea12a5e2d7e5b0fa3ce8ecd3e19eb 2 parents 68b73b6 + 954c890 ocornut authored on 30 Jul 2016

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View README.md

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below