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 533fe8cb554b6c291de575792cf29c6b5a9fa970 2 parents 8ad88f7 + 3f297e7 omar authored on 5 Feb 2018

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.cpp

Ignore Space Show notes View examples/apple_example/imguiex-ios/debug_hud.h

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View misc/freetype/README.md

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Show line notes below