Merge branch 'master' into navigation (with style breakable)

Fork: 0

mark / imgui

Browse code Merge branch 'master' into navigation (with style breakable) # Conflicts: # imgui.cpp # imgui_draw.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 d211a0e33896da09613ca87e24d9876ad06af952 2 parents 44c5903 + 4daf377 omar authored on 18 Nov 2017

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View examples/directx10_example/imgui_impl_dx10.h

Ignore Space Show notes View examples/directx11_example/imgui_impl_dx11.h

Ignore Space Show notes View examples/directx9_example/imgui_impl_dx9.h

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