omar 7feccf9ab2 Merge branch 'master' into docking ...

# Conflicts:
#	examples/imgui_impl_dx10.cpp
#	examples/imgui_impl_dx10.h
#	examples/imgui_impl_dx11.cpp
#	examples/imgui_impl_dx11.h
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_dx9.h
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	examples/imgui_impl_opengl2.h
#	examples/imgui_impl_opengl3.cpp
#	examples/imgui_impl_opengl3.h
#	imgui.cpp

2019-10-18 16:50:30 +02:00

..

build_win32.bat

Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)

2019-06-18 11:28:26 +02:00

example_sdl_directx11.vcxproj

Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)

2019-06-18 11:28:26 +02:00

example_sdl_directx11.vcxproj.filters

Implement SDL/dx11 sample

2019-06-18 11:05:29 +02:00

main.cpp

Merge branch 'master' into docking

2019-10-18 16:50:30 +02:00