Merge branch 'master' into twitpic

dlinsin · Feb 6, 2011 · 60c2605 · 60c2605
2 parents 044b4f1 + 37f1f38
commit 60c2605
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@
 *.perspective
 *.perspectivev3
 *.mode1v3
+*.xcworkspace
+*xcuserdata
 build
 .DS_Store
 Classes/ShareKit/SHKConfig.h