Merge branch 'master' into context
commit f3776055d67da7d874c85fab7f72e9d0696ecf70
2 parents 2026e79 + 8c57d8c
@omar omar authored on 24 Jan 2018
Showing 17 changed files
View
README.md
View
examples/README.txt
View
examples/directx10_example/directx10_example.vcxproj
View
examples/directx10_example/directx10_example.vcxproj.filters
View
examples/directx11_example/directx11_example.vcxproj
View
examples/directx11_example/directx11_example.vcxproj.filters
View
examples/directx9_example/directx9_example.vcxproj
View
examples/directx9_example/directx9_example.vcxproj.filters
View
examples/libs/imgui.natvis 0 → 100644
View
examples/opengl2_example/opengl2_example.vcxproj
View
examples/opengl2_example/opengl2_example.vcxproj.filters
View
examples/opengl3_example/opengl3_example.vcxproj
View
examples/opengl3_example/opengl3_example.vcxproj.filters
View
imgui.cpp
View
imgui.h
View
imgui_demo.cpp
View
imgui_internal.h