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 f94af2f5c5 Merge branch 'viewport' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_draw.cpp
6 years ago
..
Makefile
build_win32.bat
example_glfw_opengl2.vcxproj
example_glfw_opengl2.vcxproj.filters
main.cpp Merge branch 'viewport' into docking 6 years ago