Fixed merge.
1 parent 7e6700d commit 9a5f742e63f0ed98f1c34b7b771614620336f036
@omar omar authored on 15 Jun 2018
Showing 2 changed files
View
examples/imgui_impl_opengl2.cpp
View
examples/imgui_impl_opengl2.h