Merge remote branch 'upstream/master'

* 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
This commit is contained in:
Daniel Schildt 2010-11-12 23:59:36 +02:00
commit a6a60e5cd3
3 changed files with 20 additions and 0 deletions

View File

@ -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/*

3
Haskell.gitignore Normal file
View File

@ -0,0 +1,3 @@
dist
*.o
*.hi

View File

@ -12,3 +12,5 @@ capybara-*.html
/coverage/ /coverage/
/spec/tmp/* /spec/tmp/*
**.orig **.orig
config/*.yml
rerun.txt