Merge remote-tracking branch 'origin' into 2016-07-navigation

Fork: 0

mark / imgui

Browse code Merge remote-tracking branch 'origin' into 2016-07-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 5f6f4d0ffc5db0119cca4b3425f6ee5efb0b29e3 2 parents aeabda5 + 4a4d3ea ocornut authored on 29 Jul 2016

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp

Ignore Space Show notes View examples/sdl_opengl_example/imgui_impl_sdl.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Show line notes below