Merge remote-tracking branch 'origin' into 2015-05-menus
commit e674df810127a24bac39476657cc488231413c9c
2 parents 7184de2 + 097fe51
@ocornut ocornut authored on 18 May 2015
Showing 6 changed files
View
examples/directx11_example/imgui_impl_dx11.cpp
View
examples/directx9_example/imgui_impl_dx9.cpp
View
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
View
examples/opengl_example/imgui_impl_glfw.cpp
View
imgui.cpp
View
imgui.h