diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-20 12:41:40 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-20 12:41:40 -0800 |
| commit | a6b1773a44d4ef086eb30967cb041cb64312650a (patch) | |
| tree | ec293e38c9ec3ef1f32195f0d5071f73b88497ed /platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json | |
| parent | dad57df38ef86363da9bff2e62f3fddc5688f0cf (diff) | |
| parent | e2fde9cc4eff3de5ab2f513d0c24ad5471d147e6 (diff) | |
| download | qtlocation-mapboxgl-a6b1773a44d4ef086eb30967cb041cb64312650a.tar.gz | |
Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master
Also reran make style-code and manually discarded anything related to fill extrusion layers.
Diffstat (limited to 'platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json')
| -rw-r--r-- | platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json b/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json new file mode 100644 index 0000000000..08cd551fc7 --- /dev/null +++ b/platform/darwin/test/Media.xcassets/TrackingLocationMask.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "TrackingLocationMask.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "TrackingLocationMask@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "TrackingLocationMask@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +}
\ No newline at end of file |