Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
commit 378eee490ba924b18799eff7c6bdbabe4390c801
2 parents 8dd3f85 + d440a13
@ocornut ocornut authored on 9 Mar 2015
Showing 31 changed files
View
examples/README.txt
View
examples/directx11_example/directx11_example.vcxproj
View
examples/directx11_example/directx11_example.vcxproj.filters
View
examples/directx11_example/imgui_impl_dx11.cpp 0 → 100644
View
examples/directx11_example/imgui_impl_dx11.h 0 → 100644
View
examples/directx11_example/main.cpp
View
examples/directx9_example/directx9_example.vcxproj
View
examples/directx9_example/directx9_example.vcxproj.filters
View
examples/directx9_example/imgui_impl_dx9.cpp 0 → 100644
View
examples/directx9_example/imgui_impl_dx9.h 0 → 100644
View
examples/directx9_example/main.cpp
View
examples/opengl3_example/Makefile
View
examples/opengl3_example/gl3w/GL/gl3w.c 0 → 100644
View
examples/opengl3_example/gl3w/GL/gl3w.h 0 → 100644
View
examples/opengl3_example/gl3w/GL/glcorearb.h 0 → 100644
View
examples/opengl3_example/imgui_impl_glfw_gl3.cpp 0 → 100644
View
examples/opengl3_example/imgui_impl_glfw_gl3.h 0 → 100644
View
examples/opengl3_example/main.cpp
View
examples/opengl3_example/opengl3_example.vcxproj
View
examples/opengl3_example/opengl3_example.vcxproj.filters
View
examples/opengl_example/Makefile
View
examples/opengl_example/gl3w/GL/gl3w.c 100644 → 0
View
examples/opengl_example/gl3w/GL/gl3w.h 100644 → 0
View
examples/opengl_example/gl3w/GL/glcorearb.h 100644 → 0
View
examples/opengl_example/imgui_impl_glfw.cpp 0 → 100644
View
examples/opengl_example/imgui_impl_glfw.h 0 → 100644
View
examples/opengl_example/main.cpp
View
examples/opengl_example/opengl_example.vcxproj
View
examples/opengl_example/opengl_example.vcxproj.filters
View
imgui.cpp
View
imgui.h