]> source.dussan.org Git - gitignore.git/commit
Merge remote branch 'upstream/master'
authorDaniel Schildt <daniel.schildt@gmail.com>
Mon, 22 Nov 2010 22:20:29 +0000 (00:20 +0200)
committerDaniel Schildt <daniel.schildt@gmail.com>
Mon, 22 Nov 2010 22:20:29 +0000 (00:20 +0200)
commitfef6ee31cbdde51a273ee3fc8aa96843a0444bca
tree80aff91a41c35b3b6aa8682d2d6a29222775bd02
parenta6a60e5cd36b575249de6c695c8020ffdc5e5a00
parent9c7b92ae3b7042a80197d2b9f45b7d9b9391ca17
Merge remote branch 'upstream/master'

* upstream/master:
  These should go into other gitignores, like Vim.gitignore
  Added Wordpress (Forgot to 'git add .')
  Added Vim >= 7.3 persistent undo files
  Added few files to OSX.gitignore

Conflicts:
Global/OSX.gitignore