Merge pull request #3 from ialexryan/master

Thanks!
JadenGeller · Apr 10, 2015 · 0cce600 · 0cce600
2 parents 5a4d38a + 3eb0b7e
commit 0cce600
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/Contents.json b/Helium/Helium/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,59 +1,68 @@
 {
   "images" : [
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_32.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_64.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_256.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256.png",
       "scale" : "1x"
     },
     {
       "size" : "256x256",
       "idiom" : "mac",
-      "filename" : "test.png",
+      "filename" : "icon_512.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512.png",
       "scale" : "1x"
     },
     {
-      "idiom" : "mac",
       "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_1024.png",
       "scale" : "2x"
     }
   ],
   "info" : {
     "version" : 1,
     "author" : "xcode"
   }
-}
+}
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_1024.png b/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_1024.png
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_128.png b/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_128.png
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_16.png b/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_16.png
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_256.png b/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_256.png
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_32.png b/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_32.png
diff --git a/...ages.xcassets/AppIcon.appiconset/test.png → ....xcassets/AppIcon.appiconset/icon_512.png b/...ages.xcassets/AppIcon.appiconset/test.png → ....xcassets/AppIcon.appiconset/icon_512.png
diff --git a/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_64.png b/Helium/Helium/Images.xcassets/AppIcon.appiconset/icon_64.png