Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 1847270a5fd8c3227ce7229b227ad1db66fd4865
2 parents 0bb89cc + 6408ac4
@ocornut ocornut authored on 17 Apr 2015
Showing 4 changed files
View
LICENSE
View
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View
examples/opengl_example/imgui_impl_glfw.cpp
View
imgui.cpp