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

..

Assets.xcassets

[iOS][macOS] Add ImageSource bindings

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

Base.lproj

[macos] snapshotter

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

ca.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

de.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

es.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

fi.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

fr.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

hu.lproj

[android, ios, macos] Russian, Ukrainian, Hungarian and other localization updates (#9945)

2017-09-12 23:53:28 -07:00

ja.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

lt.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

nl.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

pl.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

pt-BR.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

resources

[macos] Added Layers sidebar

2016-11-28 15:45:43 -08:00

ru.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

sv.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

uk.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

vi.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

zh-Hans.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

zh-Hant.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

AppDelegate.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

AppDelegate.m

Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.2

2017-02-21 22:47:15 -08:00

Credits.rtf

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

DroppedPinAnnotation.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

DroppedPinAnnotation.m

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

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

Info.plist

[macos] allow using the integrated GPU on dual-GPU machines

2017-01-26 08:01:03 -08:00

LimeGreenStyleLayer.h

[ios, macos] Migrate MGLCustomStyleLayerAdditions to style layer API (#7250)

2016-12-07 00:01:11 -08:00

LimeGreenStyleLayer.m

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

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

LocationCoordinate2DTransformer.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

LocationCoordinate2DTransformer.m

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

main.m

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

MapDocument.h

[macos] Avoid first responder action name conflict

2016-11-28 15:45:43 -08:00

MapDocument.m

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

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

MGLStyle+MBXAdditions.h

[macos] Arrange layers top to bottom in sidebar

2017-01-06 07:47:43 -08:00

MGLStyle+MBXAdditions.m

[macos] Arrange layers top to bottom in sidebar

2017-01-06 07:47:43 -08:00

OfflinePackNameValueTransformer.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

OfflinePackNameValueTransformer.m

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

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

StyleLayerIconTransformer.h

[macos] Added Layers sidebar

2016-11-28 15:45:43 -08:00

StyleLayerIconTransformer.m

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

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

TimeIntervalTransformer.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

TimeIntervalTransformer.m

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

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

wms.json

Quadkey tokens in tile URL templates, limited WMS support (#5628)

2016-07-12 10:57:18 -07:00