Merge branch 'master' into docking
commit 8691b56136b72e7cf5932ca960d40185ff1b5af3
2 parents 7f6a025 + cc80d8e
@omar omar authored on 12 Feb 2019
Showing 4 changed files
View
docs/CHANGELOG.txt
View
examples/example_glfw_opengl2/main.cpp
View
examples/imgui_impl_metal.mm
View
examples/imgui_impl_opengl2.cpp