omar e7bfcb970e Merge branch 'master' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h

2020-01-30 15:21:16 +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

Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.

2020-01-29 20:11:42 +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