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 3ded262776288de8e485aec8268f78d012375def 2 parents 10a4a77 + 2d9d7a1 omar authored on 26 Jan 2018

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View TODO.txt

Ignore Space Show notes View examples/allegro5_example/README.md

Ignore Space Show notes View examples/libs/usynergy/README.txt 0 → 100644

Ignore Space Show notes View examples/sdl_opengl2_example/README.md

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui_internal.h

Show line notes below