You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Omar bb1e6f8af6 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
5 years ago
..
build_win32.bat Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632) 6 years ago
example_sdl_directx11.vcxproj Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32. 5 years ago
example_sdl_directx11.vcxproj.filters Normalize all the line endings. 5 years ago
main.cpp Merge branch 'master' into docking 5 years ago