omar 5f8c9ae0ef Merge branch 'viewport' into docking ...

# Conflicts:
#	imgui.cpp
#	imgui.h

2018-10-18 10:57:54 +02:00

..

example_apple_opengl2.xcodeproj

Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133, #1929)

2018-10-17 10:48:53 +02:00

main.mm

Merge branch 'viewport' into docking

2018-09-14 11:38:10 +02:00