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.
ocornut a44d4da87c Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_win32.cpp
4 years ago
..
Makefile
example_glut_opengl2.vcxproj Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest. 4 years ago
example_glut_opengl2.vcxproj.filters
main.cpp Merge branch 'master' into docking 4 years ago