Merge branch 'master' into navigation

Fork: 0

mark / imgui

Browse code Merge branch 'master' into navigation # Conflicts: # imgui.cpp 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 0bd15b52a6468c6e52e733b76375c5c2d2bdfc89 2 parents 648de2f + 7b005bd omar authored on 4 Feb 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View misc/fonts/README.txt

Ignore Space Show notes View misc/freetype/README.md 0 → 100644

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp 0 → 100644

Ignore Space Show notes View misc/freetype/imgui_freetype.h 0 → 100644

Ignore Space Show notes View misc/natvis/imgui.natvis

Show line notes below