Merge branch 'master' into ditto

This commit is contained in:
Stephen Lombardo 2011-03-14 16:20:13 -04:00
commit e28cda5cfe

4
.gitignore vendored
View File

@ -1,2 +1,6 @@
*.mode1v3
*.pbxuser
xcuserdata
xcuserdata/*
*.xcworkspace/*
*.xcworkspace