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 f1bf642e8f Merge branch 'master' into docking ... # Conflicts: # imgui.cpp # imgui.h # misc/debuggers/imgui.natvis		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	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	4 years ago
example_glut_opengl2.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	4 years ago
main.cpp	Merge branch 'master' into docking	4 years ago