Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
commit c735d3066b72757bab483c9cdf56010413828e54
2 parents 88bc8ef + fe15756
@ocornut ocornut authored on 14 Apr 2015
Showing 2 changed files
View
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View
examples/opengl_example/imgui_impl_glfw.cpp