]> source.dussan.org Git - gitignore.git/commit
Merge remote branch 'upstream/master'
authorDaniel Schildt <daniel.schildt@gmail.com>
Fri, 12 Nov 2010 21:59:36 +0000 (23:59 +0200)
committerDaniel Schildt <daniel.schildt@gmail.com>
Fri, 12 Nov 2010 21:59:36 +0000 (23:59 +0200)
commita6a60e5cd36b575249de6c695c8020ffdc5e5a00
tree7ed08408c59d14f7678b6cc73fd1f399a5d1c2ae
parente5184274b2bdf06258f0ac04be29f96032ff4e00
parent83a92c8e7fae3c24c8188e5556934b62836fc8bc
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