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
This commit is contained in:
Daniel Schildt 2010-11-23 00:20:29 +02:00
commit fef6ee31cb
2 changed files with 4 additions and 0 deletions

View File

@ -1 +1,2 @@
.*.sw[a-z]
*.un~

3
Wordpress.gitignore Normal file
View File

@ -0,0 +1,3 @@
.htaccess
wp-config.php
wp-content/uploads/