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 6aee4bcdc5 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
4 years ago
..
Makefile Examples: Fix MinGW detection in makefiles. Fix example_null build due to missing IME input libs. (#2590) 4 years ago
example_glut_opengl2.vcxproj Tables: Add empty file, skeleton. 4 years ago
example_glut_opengl2.vcxproj.filters Tables: Add empty file, skeleton. 4 years ago
main.cpp Merge branch 'master' into docking 4 years ago