Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master

Fork: 0

mark / imgui

Browse code Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master # Conflicts: # imgui.cpp # imgui.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 v1.53 v1.52 v1.51
commit bc78535bbf4bfa0da9552b505f163c6b9d8e7715 2 parents b4eeb4a + 66c4281 omar authored on 20 Aug 2017

Patch

Unified Split

Showing 5 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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below