omar 81a2546cea Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_win32_directx9/main.cpp

2018-12-20 23:06:29 +01: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-12-20 23:06:29 +01:00