Merge remote branch 'upstream/master'
fef6ee31cbdd
Actions

Authored by Daniel Schildt <daniel.schildt@gmail.com> on Nov 22 2010, 23:20.

Description

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

Committed

Daniel Schildt <daniel.schildt@gmail.com>

Nov 22 2010, 23:20

Pushed

aubort

Jul 2 2018, 16:12

Parents

Branches

Unknown

Tags

Unknown

Daniel Schildt <daniel.schildt@gmail.com> committed rGITIGNOREfef6ee31cbdd: Merge remote branch 'upstream/master' (authored by Daniel Schildt <daniel.schildt@gmail.com>).Nov 22 2010, 23:20

Commit	Author	Details	Committed
9c7b92ae3b70	Chris Wanstrath	These should go into other gitignores, like Vim.gitignore	Nov 19 2010
1a711cc2430c	Tom Milewski/Chris Wanstrath	Added Wordpress (Forgot to 'git add .')	Nov 19 2010
ea0b4b92cb9d	Magnus Woldrich/Chris Wanstrath	Added Vim >= 7.3 persistent undo files	Nov 19 2010
771ad365e4a5	Daniel Schildt/Chris Wanstrath	Added few files to OSX.gitignore	Nov 19 2010

				Path
	M			Global/vim.gitignore
	A			Wordpress.gitignore