[Fixed] screenshot size now 1024x560

gauss1181 · 653f2ca8005b0dedc65b64082e4f4b5927710653 · shaohan committed Aug 3, 2014 · Aug 3, 2014 · 653f2ca
1 parent 4b7de5f
commit 653f2ca8005b0dedc65b64082e4f4b5927710653
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,5 @@
 *.ai
 *.sketch
 *.DS_Store
-<<<<<<< HEAD
-.DS_Store
-=======
 img-logo/.DS_Store
->>>>>>> 0d23d407e92a3d33ccbd6ec4988e4a96b229f49a
+*.psd
diff --git a/img-screenshots/sc-1.png → img-screenshots/archive/sc-1.png b/img-screenshots/sc-1.png → img-screenshots/archive/sc-1.png
diff --git a/img-screenshots/sc-10.png → img-screenshots/archive/sc-10.png b/img-screenshots/sc-10.png → img-screenshots/archive/sc-10.png
diff --git a/img-screenshots/sc-11.png → img-screenshots/archive/sc-11.png b/img-screenshots/sc-11.png → img-screenshots/archive/sc-11.png
diff --git a/img-screenshots/sc-12.png → img-screenshots/archive/sc-12.png b/img-screenshots/sc-12.png → img-screenshots/archive/sc-12.png
diff --git a/img-screenshots/sc-13.png → img-screenshots/archive/sc-13.png b/img-screenshots/sc-13.png → img-screenshots/archive/sc-13.png
diff --git a/img-screenshots/sc-14.png → img-screenshots/archive/sc-14.png b/img-screenshots/sc-14.png → img-screenshots/archive/sc-14.png
diff --git a/img-screenshots/sc-15.png → img-screenshots/archive/sc-15.png b/img-screenshots/sc-15.png → img-screenshots/archive/sc-15.png
diff --git a/img-screenshots/sc-16.png → img-screenshots/archive/sc-16.png b/img-screenshots/sc-16.png → img-screenshots/archive/sc-16.png
diff --git a/img-screenshots/sc-2.png → img-screenshots/archive/sc-2.png b/img-screenshots/sc-2.png → img-screenshots/archive/sc-2.png
diff --git a/img-screenshots/sc-3.png → img-screenshots/archive/sc-3.png b/img-screenshots/sc-3.png → img-screenshots/archive/sc-3.png
diff --git a/img-screenshots/sc-4.png → img-screenshots/archive/sc-4.png b/img-screenshots/sc-4.png → img-screenshots/archive/sc-4.png
diff --git a/img-screenshots/sc-5.png → img-screenshots/archive/sc-5.png b/img-screenshots/sc-5.png → img-screenshots/archive/sc-5.png
diff --git a/img-screenshots/sc-6.png → img-screenshots/archive/sc-6.png b/img-screenshots/sc-6.png → img-screenshots/archive/sc-6.png
diff --git a/img-screenshots/sc-7.png → img-screenshots/archive/sc-7.png b/img-screenshots/sc-7.png → img-screenshots/archive/sc-7.png
diff --git a/img-screenshots/sc-8.png → img-screenshots/archive/sc-8.png b/img-screenshots/sc-8.png → img-screenshots/archive/sc-8.png
diff --git a/img-screenshots/sc-9.png → img-screenshots/archive/sc-9.png b/img-screenshots/sc-9.png → img-screenshots/archive/sc-9.png
diff --git a/img-screenshots/sc-1.jpg b/img-screenshots/sc-1.jpg
diff --git a/img-screenshots/sc-10.jpg b/img-screenshots/sc-10.jpg
diff --git a/img-screenshots/sc-11.jpg b/img-screenshots/sc-11.jpg
diff --git a/img-screenshots/sc-12.jpg b/img-screenshots/sc-12.jpg
diff --git a/img-screenshots/sc-13.jpg b/img-screenshots/sc-13.jpg
diff --git a/img-screenshots/sc-14.jpg b/img-screenshots/sc-14.jpg
diff --git a/img-screenshots/sc-15.jpg b/img-screenshots/sc-15.jpg
diff --git a/img-screenshots/sc-16.jpg b/img-screenshots/sc-16.jpg
diff --git a/img-screenshots/sc-2.jpg b/img-screenshots/sc-2.jpg
diff --git a/img-screenshots/sc-3.jpg b/img-screenshots/sc-3.jpg
diff --git a/img-screenshots/sc-4.jpg b/img-screenshots/sc-4.jpg
diff --git a/img-screenshots/sc-5.jpg b/img-screenshots/sc-5.jpg
diff --git a/img-screenshots/sc-6.jpg b/img-screenshots/sc-6.jpg
diff --git a/img-screenshots/sc-7.jpg b/img-screenshots/sc-7.jpg
diff --git a/img-screenshots/sc-8.jpg b/img-screenshots/sc-8.jpg
diff --git a/img-screenshots/sc-9.jpg b/img-screenshots/sc-9.jpg
diff --git a/website/img/downloads-bg1.psd b/website/img/downloads-bg1.psd
diff --git a/website/img/intro-bg.psd b/website/img/intro-bg.psd