Merge remote-tracking branch 'OliverLetterer/patch-1'

jspahrsummers · jspahrsummers · commit 8486f2204990 · 2012-08-02T19:02:06.000-07:00
Conflicts:
	Objective-C.gitignore
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -1,6 +1,6 @@
 # Xcode
 .DS_Store
-build/*
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -14,4 +14,4 @@ build/*
 xcuserdata
 profile
 *.moved-aside
-DerivedData
+DerivedData
