Merge remote branch 'upstream/master'

d2s · d2s · commit a6a60e5cd36b · 2010-11-12T23:59:36.000+02:00
* upstream/master:
  added rerun and config ignores
  Add Haskell gitignore
  Added ExpressionEngine gitignore file.
  Fixed comment in Objective-C.gitignore
  Fixed comments in C++.gitignore
  Fixed comments in Archives.gitignore
  Fixed comment in Linux.gitignore file
  Small cleanup of comments in the file
diff --git a/ExpressionEngine.gitignore b/ExpressionEngine.gitignore
@@ -0,0 +1,15 @@
+.DS_Store
+
+# Images
+images/avatars/
+images/captchas/
+images/smileys/
+images/member_photos/
+images/signature_attachments/
+images/pm_attachments/
+
+# Caches
+sized/
+thumbs/
+_thumbs/
+*/expressionengine/cache/*
diff --git a/Haskell.gitignore b/Haskell.gitignore
@@ -0,0 +1,3 @@
+dist
+*.o
+*.hi
diff --git a/Rails.gitignore b/Rails.gitignore
@@ -12,3 +12,5 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
+config/*.yml
+rerun.txt
