Merge branch 'master' of https://github.com/ocornut/imgui

Fork: 0

mark / imgui

Browse code Merge branch 'master' of https://github.com/ocornut/imgui 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 v1.53 v1.52 v1.51 v1.50 v1.49 v1.48 v1.47
commit 6e2e60ffad4ed4cd629486a12dfc150d3577afa0 2 parents e4ba6e5 + c0ec9f4 ocornut authored on 28 Nov 2015

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View README.md

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

Show line notes below