diff options
| author | Jason Wray <jason@mapbox.com> | 2018-05-30 12:56:55 -0400 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2018-05-30 13:01:04 -0400 |
| commit | e67f0be81301abce9454c678f677d37d61a03631 (patch) | |
| tree | 223a5523b4142ca3136589fd492c2f4e19ea82aa /platform/default/mbgl/map/map_snapshotter.cpp | |
| parent | 83ebd5f6ff56fddd4a2923f6c082977476cddd99 (diff) | |
| parent | 43efd61813dfddb0ac673314350d95aa1a86b8cb (diff) | |
| download | qtlocation-mapboxgl-e67f0be81301abce9454c678f677d37d61a03631.tar.gz | |
Merge tag 'ios-v4.0.2' into masterupstream/fb-merge-release-ios-v4.0.2
Conflicts:
mapbox-gl-js
platform/android/CHANGELOG.md
platform/android/gradle/dependencies.gradle
platform/ios/CHANGELOG.md
platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
platform/ios/Mapbox-iOS-SDK-symbols.podspec
platform/ios/Mapbox-iOS-SDK.podspec
platform/node/test/ignores.json
src/mbgl/geometry/feature_index.cpp
src/mbgl/geometry/feature_index.hpp
src/mbgl/layout/symbol_layout.cpp
Diffstat (limited to 'platform/default/mbgl/map/map_snapshotter.cpp')
0 files changed, 0 insertions, 0 deletions