Merge branch 'master' into navigation

Fork: 0

mark / imgui

Browse code Merge branch 'master' into navigation 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 ffb4f6ca8cdfb9dfa6786396bd3ee997b18d2d6b 2 parents 1c1e490 + d976e4e omar authored on 23 Dec 2017

Patch

Unified Split

Showing 10 changed files

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

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

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

Ignore Space Show notes View examples/null_example/build_win32.bat 0 → 100644

Ignore Space Show notes View examples/null_example/main.cpp 0 → 100644

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