Commit ff4f6077 authored by Zach Knox's avatar Zach Knox
Browse files

Merge branch 'ui' into 'dev-0.0'

apparently I didn't commit the icon with the gradient. ooos

See merge request !7
parents 8c50bd21 d5cfbf40
......@@ -3,7 +3,7 @@
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "Icon-App-20x20@1x-1.png",
"filename" : "Icon-App-20x20@2x-1.png",
"scale" : "2x"
},
{
......@@ -27,13 +27,13 @@
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "Icon-29@3x.png",
"filename" : "Icon-App-29x29@3x.png",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "Icon-App-40x40@1x-1.png",
"filename" : "Icon-App-40x40@2x.png",
"scale" : "2x"
},
{
......@@ -45,13 +45,13 @@
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon-App-57x57@1x.png",
"filename" : "Icon.png",
"scale" : "1x"
},
{
"size" : "57x57",
"idiom" : "iphone",
"filename" : "Icon-App-57x57@2x.png",
"filename" : "Icon@2x.png",
"scale" : "2x"
},
{
......@@ -87,7 +87,7 @@
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "Icon-29@2x.png",
"filename" : "Icon-App-29x29@2x.png",
"scale" : "2x"
},
{
......@@ -247,13 +247,15 @@
"scale" : "2x"
},
{
"idiom" : "mac",
"size" : "512x512",
"idiom" : "mac",
"filename" : "ItunesArtwork.png",
"scale" : "1x"
},
{
"idiom" : "mac",
"size" : "512x512",
"idiom" : "mac",
"filename" : "ItunesArtwork@2x.png",
"scale" : "2x"
}
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment