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 e32256b4b4 Merge branch 'viewport' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h
6 years ago
..
example_apple_opengl2.xcodeproj OSX: Added imgui_widgets.cpp to xcode project files. 6 years ago
main.mm Merge branch 'viewport' into docking 6 years ago