Merge branch 'master' into navigation

Fork: 0

mark / imgui

Browse code Merge branch 'master' into navigation # Conflicts: # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h 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 0a3db267c3f4601fdfc52c339ec71e453774e8b3 2 parents 38bfdb3 + 6190ab0 omar authored on 12 Dec 2017

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View extra_fonts/README.txt

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