Merge branch 'master' into navigation + merge fix

Fork: 0

mark / imgui

Browse code Merge branch 'master' into navigation + merge fix # 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 e6215b6ca0924690741c548d49ce81a1f9f36a7a 2 parents 6deb865 + 3c9f9a4 omar authored on 7 Dec 2017

Patch

Unified Split

Showing 4 changed files

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