Merge branch 'data_types'

Fork: 0

mark / imgui

Browse code Merge branch 'data_types' # Conflicts: # CHANGELOG.txt # 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
commit 81494084083805159c30a87f7314883b788fa7be 2 parents 14f575f + 4cabf59 omar authored on 11 May 2018

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View CHANGELOG.txt

Ignore Space Show notes View TODO.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_draw.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below