Merge branch 'master' into 2016-02-colorpicker
commit 89b149784342093b8a4551592ff7089c920fd9b2
2 parents 92ea8d1 + a0a6c8a
@omar omar authored on 1 May 2017
Showing 12 changed files
View
README.md
View
examples/README.txt
View
examples/apple_example/imguiex-ios/imgui_impl_ios.mm
View
examples/opengl2_example/imgui_impl_glfw.cpp
View
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View
examples/sdl_opengl2_example/imgui_impl_sdl.cpp
View
examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
View
imconfig.h
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_draw.cpp