aboutsummaryrefslogtreecommitdiff
path: root/objectivec
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2015-06-10 13:17:59 -0700
committerJisi Liu <liujisi@google.com>2015-06-10 13:17:59 -0700
commit7b354163742ab67e0e920fa6da0f43e2789855c2 (patch)
tree07efbcbc90cf17a48129411676b9cd8f59ebffce /objectivec
parent91becaa867fc25fdd588b951c12f5af16bc5731b (diff)
parent0f2b4a0e82a2d961f9b8c51f9fcd8d303f318975 (diff)
downloadprotobuf-7b354163742ab67e0e920fa6da0f43e2789855c2.tar.gz
protobuf-7b354163742ab67e0e920fa6da0f43e2789855c2.tar.bz2
protobuf-7b354163742ab67e0e920fa6da0f43e2789855c2.zip
Merge pull request #486 from thomasvl/assets_podspec
Update podspec, rename assets to drop @
Diffstat (limited to 'objectivec')
-rw-r--r--objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json12
-rw-r--r--objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png)bin17744 -> 17744 bytes
-rw-r--r--objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png)bin18788 -> 18788 bytes
-rw-r--r--objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png)bin13348 -> 13348 bytes
-rw-r--r--objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png)bin11128 -> 11128 bytes
-rw-r--r--objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png (renamed from objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png)bin21792 -> 21792 bytes
6 files changed, 6 insertions, 6 deletions
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json
index ecd3584e..0cbf9acc 100644
--- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -34,19 +34,19 @@
{
"size" : "57x57",
"idiom" : "iphone",
- "filename" : "iPhone6@2x.png",
+ "filename" : "iPhone6_2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "iPhone7@2x.png",
+ "filename" : "iPhone7_2x.png",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
- "filename" : "iPhone7@3x.png",
+ "filename" : "iPhone7_3x.png",
"scale" : "3x"
},
{
@@ -88,7 +88,7 @@
{
"size" : "72x72",
"idiom" : "ipad",
- "filename" : "iPad6@2x.png",
+ "filename" : "iPad6_2x.png",
"scale" : "2x"
},
{
@@ -100,7 +100,7 @@
{
"size" : "76x76",
"idiom" : "ipad",
- "filename" : "iPad7@2x.png",
+ "filename" : "iPad7_2x.png",
"scale" : "2x"
},
{
@@ -113,4 +113,4 @@
"version" : 1,
"author" : "xcode"
}
-} \ No newline at end of file
+}
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png
index 2ec93704..2ec93704 100644
--- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6@2x.png
+++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad6_2x.png
Binary files differ
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png
index e39cc3e7..e39cc3e7 100644
--- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7@2x.png
+++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPad7_2x.png
Binary files differ
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png
index 2424997f..2424997f 100644
--- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6@2x.png
+++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone6_2x.png
Binary files differ
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png
index 10bfc3cf..10bfc3cf 100644
--- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@2x.png
+++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_2x.png
Binary files differ
diff --git a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png
index 8d16f14d..8d16f14d 100644
--- a/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7@3x.png
+++ b/objectivec/Tests/iOSTestHarness/Images.xcassets/AppIcon.appiconset/iPhone7_3x.png
Binary files differ