Merge branch 'master' into 2016-02-colorpicker
commit 3e4cb40d458038562c23695cb1d3e0bee1bf7e50
2 parents c038339 + d1145e9
@omar omar authored on 18 Jul 2017
Showing 13 changed files
View
.travis.yml
View
README.md
View
examples/directx10_example/imgui_impl_dx10.cpp
View
examples/directx11_example/imgui_impl_dx11.cpp
View
examples/directx9_example/imgui_impl_dx9.cpp
View
examples/opengl2_example/Makefile
View
examples/opengl3_example/Makefile
View
examples/sdl_opengl3_example/Makefile 0 → 100644
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp
View
imgui_internal.h