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

..

Base.lproj

[ios, macos] Cleaned up base localization files

2017-12-18 11:41:56 -08:00

bg.lproj

[android, ios, macos] Added Bulgarian localization

2017-10-27 22:23:02 -07:00

ca.lproj

[android, ios, macos] Updated translations

2017-09-22 10:05:40 -07:00

de.lproj

[ios, macos] Brazilian Portuguese, French, German, Japanese, Swedish, Vietnamese

2017-02-09 10:52:33 -08:00

es.lproj

Update iOS, macOS SDK translations (#10738)

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

fi.lproj

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

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

fr.lproj

[android, ios, macos] Updated French localization

2017-07-19 18:11:30 -07: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] Brazilian Portuguese, French, German, Japanese, Swedish, Vietnamese

2017-02-09 10:52:33 -08:00

lt.lproj

[ios, macos] Updated localizations from Transifex

2017-05-08 15:17:32 -07:00

nl.lproj

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

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

pl.lproj

[ios, macos] Polish, Russian, Spanish, Ukrainian translations

2017-02-20 14:54:57 -08:00

pt-BR.lproj

[ios, macos] Updated Brazilian Portuguese localization

2017-10-27 22:23:02 -07:00

ru.lproj

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

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

sv.lproj

[ios, macos] Updated localizations from Transifex

2017-05-08 15:17:32 -07:00

uk.lproj

[android, ios, macos] Updated translations

2017-09-22 10:05:40 -07:00

vi.lproj

Update iOS, macOS SDK translations (#10738)

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

zh-Hans.lproj

[macos] Added Simplified Chinese localization

2016-12-21 13:51:34 -08:00

zh-Hant.lproj

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

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

default_marker.pdf

[ios, macos] Fix size and color of default marker image

2017-06-26 14:56:21 -04:00

Info.plist

[macos] Add Info.plist version keys

2017-12-07 19:01:12 -05:00

mapbox_helmet.pdf

[ios, macos] Update the attribution format for small snapshots.

2017-11-17 16:40:12 -05:00

mapbox.pdf

[ios, macos] Update MGLMapView logo view (#8771)

2017-04-24 13:31:22 -04:00