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
..
2017-11-22 13:56:38 -08:00
2016-06-18 14:58:07 -07:00
2017-01-27 11:44:16 +01:00
2017-01-27 11:44:16 +01:00
2017-01-04 23:06:22 +01:00
2017-01-27 11:44:16 +01:00
2016-06-18 14:58:07 -07:00
2016-06-18 14:58:07 -07:00
2017-07-18 10:45:12 +02:00
2017-12-21 20:39:26 -06:00
2018-01-04 12:55:19 -06:00
2017-01-27 11:44:16 +01:00
2016-08-16 16:46:04 -07:00
2017-03-07 17:39:42 -08:00
2016-08-18 11:35:32 -04:00
2017-02-20 12:34:05 -08:00
2016-10-17 11:47:22 -07:00
2017-01-27 11:44:16 +01:00
2017-06-19 09:50:08 -07:00
2017-11-27 16:47:58 -08:00