Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 323ae8326ee59317739b5cd4069322013433a9e1
2 parents 6ba7a74 + d692286
@ocornut ocornut authored on 7 Apr 2015
Showing 12 changed files
View
README.md
View
examples/README.txt
View
examples/directx11_example/main.cpp
View
examples/directx9_example/imgui_impl_dx9.cpp
View
examples/directx9_example/main.cpp
View
examples/opengl3_example/main.cpp
View
examples/opengl_example/imgui_impl_glfw.cpp
View
examples/opengl_example/main.cpp
View
extra_fonts/README.txt
View
imconfig.h
View
imgui.cpp
View
imgui.h