Fabian Guerra 6d1fdf2ca3 Merge branch 'release-ios-v3.6.0-android-v5.1.0' into master. ...

# Conflicts:
#	circle.yml
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/dependencies.gradle
#	platform/default/mbgl/storage/offline_database.cpp
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/app/Main.storyboard
#	platform/ios/src/MGLMapView.mm
#	src/mbgl/programs/attributes.hpp
#	src/mbgl/renderer/painter_fill.cpp
#	src/mbgl/tile/geometry_tile.hpp
#	src/mbgl/tile/geometry_tile_worker.cpp
#	src/mbgl/tile/raster_tile.cpp
#	src/mbgl/tile/raster_tile.hpp
#	src/mbgl/tile/raster_tile_worker.cpp
#	test/tile/annotation_tile.test.cpp
#	test/tile/geojson_tile.test.cpp
#	test/tile/raster_tile.test.cpp
#	test/tile/vector_tile.test.cpp

2017-09-27 12:08:24 -04:00

..

Mapbox.h

[macos] snapshotter

2017-09-05 16:29:33 +03:00

MGLAnnotationImage_Private.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-18 14:58:07 -07:00

MGLAnnotationImage.h

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MGLAnnotationImage.m

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MGLAttributionButton.h

[build] add -fvisibility=hidden to macOS dynamic framework and export required symbols

2017-01-04 23:06:22 +01:00

MGLAttributionButton.mm

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MGLCompassCell.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-18 14:58:07 -07:00

MGLCompassCell.m

[macos] Renamed OS X SDK to macOS SDK

2016-06-18 14:58:07 -07:00

MGLMapView_Private.h

[ios][macos] rendering interface changes

2017-07-18 10:45:12 +02:00

MGLMapView.h

Merge branch 'release-ios-v3.6.0-android-v5.1.0' into master.

2017-09-27 12:08:24 -04:00

MGLMapView.mm

Preserve depth buffer between 3D layers + optimize render order (#9931)

2017-09-21 14:26:48 -07:00

MGLMapView+IBAdditions.h

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

MGLMapView+IBAdditions.mm

[ios, macos] Renamed Objective-C++ headers to .h

2016-08-16 16:46:04 -07:00

MGLMapViewDelegate.h

[ios, macos] Added a timing note for two delegate methods (#8259)

2017-03-07 17:39:42 -08:00

MGLOpenGLLayer.h

[ios, macos] Make Xcode 7.3 the minimum required version

2016-08-18 11:35:32 -04:00

MGLOpenGLLayer.mm

[macos] reuse OpenGL context when switching screens

2017-02-20 12:34:05 -08:00

NSColor+MGLAdditions.h

[ios, macos] Change runtime styling category method prefix to mgl_

2016-10-17 11:47:22 -07:00

NSColor+MGLAdditions.mm

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

NSImage+MGLAdditions.h

[iOS][macOS] Export MGLImageSource, add and update documentation. Use animated ImageSource demo in iOS test app

2017-06-19 09:50:08 -07:00

NSImage+MGLAdditions.mm

[macos] Use [NSImage CGImageForProposedRect:context:hints:] instead of drawing into a bitmap representation

2017-07-17 12:20:03 -07:00