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-08-11 09:28:24 -07:00
2017-07-13 01:38:29 -04:00
2017-01-27 11:44:16 +01:00
2017-03-02 18:19:23 -05:00
2017-07-13 01:38:29 -04:00
2017-06-02 23:41:14 +02:00
2017-01-11 15:55:54 -08:00
2017-06-19 09:34:44 -10:00
2017-01-27 11:44:16 +01:00
2017-10-11 12:21:27 -07:00
2017-01-27 11:44:16 +01:00
2017-09-28 19:10:06 -07:00
2017-11-16 17:15:59 -05:00
2017-02-16 12:36:21 -08:00
2017-11-03 12:17:45 -07:00
2018-01-02 19:36:31 -05:00
2017-06-02 23:41:14 +02:00
2017-07-18 10:45:12 +02:00
2017-12-21 14:04:09 -06:00
2018-01-04 12:55:19 -06:00
2017-12-14 09:48:23 -06:00
2017-03-29 16:58:07 -07:00
2017-04-16 17:24:17 +02:00
2017-10-25 14:31:55 -07:00
2017-03-07 10:43:08 -08:00
2017-12-06 10:13:17 -05:00
2017-10-11 10:06:30 -07:00
2017-08-28 16:41:55 -04:00
2016-08-16 15:16:59 -04:00
2017-07-13 01:38:29 -04:00
2017-01-27 11:44:16 +01:00
2017-09-07 19:23:29 -04:00
2017-09-07 19:23:29 -04:00
2017-09-07 19:23:29 -04:00
2017-09-06 18:21:38 -04:00
2017-09-07 19:23:29 -04:00
2016-10-17 11:47:22 -07:00
2016-10-17 11:47:22 -07:00
2017-10-04 10:03:03 -04:00
2017-11-27 16:47:58 -08:00
2017-05-02 14:07:57 -07:00
2017-05-02 14:07:57 -07:00