diff options
author | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
---|---|---|
committer | Jie Luo <anandolee@gmail.com> | 2015-05-13 15:24:42 -0700 |
commit | 2d9b1c592ff7319ee9d6520c9df4838087522e05 (patch) | |
tree | 6eec7e633840b5b60cc85e20f6365df0702e6911 /objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json | |
parent | 8a888922a9ac181a3fb47d00d497cde85ec4987a (diff) | |
parent | 38da6583b1416a7c1594bffec3cdbb8856a72353 (diff) | |
download | protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.gz protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.tar.bz2 protobuf-2d9b1c592ff7319ee9d6520c9df4838087522e05.zip |
Merge pull request #382 from jtattermusch/integrate_from_master
Integrate changes from latest master branch into csharp branch.
Diffstat (limited to 'objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json')
-rw-r--r-- | objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json | 116 |
1 files changed, 116 insertions, 0 deletions
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..ecd3584e --- /dev/null +++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "iPhone6.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "iPhone6@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "iPhone7@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "iPhone7@3x.png", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "2x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "iPad6.png", + "scale" : "1x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "iPad6@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "iPad7.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "iPad7@2x.png", + "scale" : "2x" + }, + { + "idiom" : "car", + "size" : "120x120", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file |