Homec4science

Merge branch 'master' of https://github.com/github/gitignore

Authored by Ali Servet Donmez <asd@pittle.org> on Aug 22 2012, 12:22.

Description

Merge branch 'master' of https://github.com/github/gitignore

Event Timeline

Ali Servet Donmez <asd@pittle.org> committed rGITIGNOREd08fbbd0d473: Merge branch 'master' of https://github.com/github/gitignore (authored by Ali Servet Donmez <asd@pittle.org>).Aug 22 2012, 12:22

Merged Changes

CommitAuthorDetailsCommitted
c160ad912ac5Coby Chapple
Merge pull request #415 from honzajavorek/patch-1 
Aug 20 2012
2f7bc6bab32fHonza Javorek
added missing whitespaces in comments 
Aug 18 2012
76dd79a51f7dCoby Chapple
Merge pull request #406 from ecarreras/master 
Aug 10 2012
d14aab9a64adCoby Chapple
Merge pull request #407 from AArnott/patch-1 
Aug 10 2012
e732aa40a1a7Justin Spahr-Summers
Merge pull request #348 from bjoern-esser/master 
Aug 9 2012
fa954f291ef3Justin Spahr-Summers
Merge pull request #334 from mkenyon/master 
Aug 9 2012
f453a04cb437Justin Spahr-Summers
Merge pull request #294 from yrashk/patch-1 
Aug 9 2012
b2818653f65fCoby Chapple
Merge pull request #360 from svanschu/master 
Aug 9 2012
de7a7117c71bAndrew Arnott
Added .vspx and .log to .gitignore for VB 
Aug 9 2012
6073319fb14cAndrew Arnott
Added .gitignore entries for .vspx and .log 
Aug 9 2012
2661a8201010Eduard Carreras
Adding pydev files 
Aug 8 2012
5a860949c085Coby Chapple
Remove space after Thumbs.db — fixes #355 
Aug 8 2012
c27430e74c03Sven Schultschik
PhPStorm gitignore 
Jun 4 2012
4eebde9c47a1Björn Esser
added rule for .bz2 --> bzip2 
May 19 2012
720975f849ceMike Kenyon
Add OSX-specific Icon\r rule 
May 2 2012
e1c4a4872986Yurii Rashkovskii
priv is a legitimate part of an OTP application 
Apr 18 2012