Fabian Guerra 187b6dc31c Merge branch 'release-agua' into master ...

# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp

2018-01-04 12:55:19 -06:00

..

ar.lproj

Update iOS, macOS SDK translations (#10738)

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

Assets.xcassets

[iOS][macOS] Add ImageSource bindings

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

Base.lproj

[ios,macos] Add MGLComputedShapeSource example to demo apps

2017-11-22 13:56:38 -08:00

bg.lproj

[android, ios, macos] Added Bulgarian localization

2017-10-27 22:23:02 -07: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

[ios, macos] Updates documentation with default CJK font recommendations

2018-01-03 11:37:53 -06: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

[ios, macos] Move private categories into explicitly private headers

2018-01-02 19:36:31 -05: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