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 a704614b3e Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.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 Normalize all the line endings. 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