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 cbf24c13caa7c3e35636709bed041dfbedf17ce2 2 parents d85c1be + 5d1a0a6 ocornut authored on 7 Aug 2016

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_internal.h

Show line notes below