Fabian Guerra b68266953f Merge tag 'ios-v3.7.4' into master ...

# Conflicts:
#	include/mbgl/style/conversion/tileset.hpp
#	include/mbgl/util/tileset.hpp
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/ios/CHANGELOG.md
#	platform/ios/ios.xcodeproj/project.pbxproj
#	platform/macos/CHANGELOG.md
#	src/mbgl/layout/symbol_projection.cpp
#	src/mbgl/renderer/tile_pyramid.cpp
#	src/mbgl/style/conversion/tileset.cpp

2018-02-13 11:40:40 -05:00

..

src

Merge tag 'ios-v3.7.4' into master

2018-02-13 11:40:40 -05:00

build.gradle

[android] Integration of the new events library (#10999)

2018-02-13 11:31:43 +01:00

gradle.properties

[android] - update SNAPSHOT version to v5.4.2

2018-02-12 11:14:39 +01:00

lint.xml

[android] Move into platform subdirectory

2015-12-16 14:52:29 -08:00

proguard-rules.pro

[android] - add optional location provider lost to proguard configuration

2018-02-09 11:58:41 +01:00