Merge remote branch 'upstream/master'
a6a60e5cd36b
Actions

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

Description

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

Committed

Daniel Schildt <daniel.schildt@gmail.com>

Nov 12 2010, 22:59

Pushed

aubort

Jul 2 2018, 16:12

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
83a92c8e7fae	seenmyfate/Chris Wanstrath	added rerun and config ignores	Nov 12 2010
b2bbec62d039	Jasper Van der Jeugt/Chris Wanstrath	Add Haskell gitignore	Nov 12 2010
550ef6f668f2	Wes Baker/Chris Wanstrath	Added ExpressionEngine gitignore file.	Nov 12 2010
e58baf9625a0	Daniel Schildt/Chris Wanstrath	Fixed comment in Objective-C.gitignore	Nov 12 2010
605476c52827	Daniel Schildt/Chris Wanstrath	Fixed comments in C++.gitignore	Nov 12 2010
71054b86d63d	Daniel Schildt/Chris Wanstrath	Fixed comments in Archives.gitignore	Nov 12 2010
cd7597dd5f5b	Daniel Schildt/Chris Wanstrath	Fixed comment in Linux.gitignore file	Nov 12 2010
cb9fac433487	Daniel Schildt/Chris Wanstrath	Small cleanup of comments in the file	Nov 12 2010

				Path
	A			ExpressionEngine.gitignore
	A			Haskell.gitignore
	M			Rails.gitignore