Merge branch 'objective-c'

Conflicts: Colors/checker.png Colors/colors.php Colors/icon.png Colors/info.plist Colors/update.json Colors/workflows.php Workflows/colorsiOS.alfredworkflow
TylerEich · Jan 28, 2014 · bcb8f15 · bcb8f15
2 parents c93f5e2 + 37c6ee6
commit bcb8f15
Show file tree

Hide file tree

Showing 45 changed files with 2,916 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,23 @@
+# OS X
+.DS_Store
+
+# Xcode
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+profile
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+
+# CocoaPods
+Pods
diff --git a/Colors/checker.png b/Colors/checker.png
diff --git a/Screenshots/Colors-Hexadecimal.png b/Screenshots/Colors-Hexadecimal.png
diff --git a/Screenshots/Colors-NSColor.png b/Screenshots/Colors-NSColor.png
diff --git a/Screenshots/Colors-Preview.jpg b/Screenshots/Colors-Preview.jpg
diff --git a/Screenshots/Colors-UIColor.png b/Screenshots/Colors-UIColor.png
diff --git a/Screenshots/Colors-Workflow.jpg b/Screenshots/Colors-Workflow.jpg
diff --git a/Screenshots/ColorsiOS-Preview.jpg b/Screenshots/ColorsiOS-Preview.jpg