omar 813e0c18e6 Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx10.h # examples/imgui_impl_dx11.cpp # examples/imgui_impl_dx11.h # examples/imgui_impl_dx12.cpp # examples/imgui_impl_dx12.h # examples/imgui_impl_dx9.cpp # examples/imgui_impl_dx9.h # examples/imgui_impl_metal.h # examples/imgui_impl_metal.mm # examples/imgui_impl_opengl3.cpp # examples/imgui_impl_opengl3.h # examples/imgui_impl_vulkan.cpp # imgui.cpp # imgui.h # imgui_internal.h		2019-11-26 12:23:43 +01: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	Normalize all the line endings.	2019-11-04 15:28:31 +01:00
example_sdl_directx11.vcxproj.filters	Normalize all the line endings.	2019-11-04 15:28:31 +01:00
main.cpp	Merge branch 'master' into docking	2019-11-26 12:23:43 +01:00