omar f0364aa359 Merge branch 'context' ...

# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp

2018-02-06 20:16:03 +01:00

..

build_win32.bat

Examples: Fixed msvc batch files from warning.

2015-12-07 21:27:25 +00:00

directx10_example.vcxproj

Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)

2018-01-31 16:00:07 +01:00

directx10_example.vcxproj.filters

Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)

2018-01-31 16:00:07 +01:00

imgui_impl_dx10.cpp

Merge branch 'context'

2018-02-06 20:16:03 +01:00

imgui_impl_dx10.h

Examples: Organized header files to make available features more visible.

2018-02-05 20:34:11 +01:00

main.cpp

Merge branch 'context'

2018-02-06 20:16:03 +01:00