Merge branch 'master' into 2016-02-colorpicker

Fork: 0

mark / imgui

Browse code Merge branch 'master' into 2016-02-colorpicker 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
commit a60b2cc645040b09a6e519a76da76d3ac088d891 2 parents f4cf972 + db59322 ocornut authored on 23 Dec 2016

Patch

Unified Split

Showing 7 changed files

Ignore Space Show notes View README.md

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

Ignore Space Show notes View examples/opengl2_example/Makefile

Ignore Space Show notes View examples/opengl3_example/Makefile

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Show line notes below