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

Conflicts: Objective-C.gitignore
nobuyuki213 · Aug 27, 2012 · f1cb24b · f1cb24b
2 parents f78c09f + 6670a4c
commit f1cb24b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -15,3 +15,4 @@ xcuserdata
 profile
 *.moved-aside
 DerivedData
+.idea/