Started implementing welcome wizard

popcorn-official · Jan 15, 2015 · 2ed3592 · 2ed3592
1 parent a030ee6
commit 2ed3592
Show file tree

Hide file tree

Showing 26 changed files with 424 additions and 222 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,27 @@ proguard/
 # Keystore
 *.jks
 com_crashlytics_export_strings.xml
-crashlytics-build.properties
+crashlytics-build.properties
+
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk