Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit bb385fabd4dc1890f87be0294419996bd4095447
2 parents 26991bb + 0a31531
@ocornut ocornut authored on 30 Mar 2015
Showing 6 changed files
View
examples/directx11_example/main.cpp
View
examples/directx9_example/main.cpp
View
examples/opengl3_example/main.cpp
View
examples/opengl_example/main.cpp
View
imgui.cpp
View
imgui.h