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 2665288b30 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
5 years ago
..
Makefile
build_win32.bat
example_glfw_opengl2.vcxproj
example_glfw_opengl2.vcxproj.filters
main.cpp Merge branch 'master' into docking 5 years ago