Homec4science

Merging upstream

Authored by Nick Hodges <nickhodges@gmail.com> on Nov 27 2013, 21:03.

Description

Merging upstream

Event Timeline

Nick Hodges <nickhodges@gmail.com> committed rGITIGNORE412d6907bcfd: Merging upstream (authored by Nick Hodges <nickhodges@gmail.com>).Nov 27 2013, 21:03

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
a6dc172eaa6eAdam Roben
Merge pull request #879 from phmarek/master 
Nov 27 2013
1c7c01521a4fAdam Roben
Merge pull request #878 from minsOne/master 
Nov 27 2013
b81b5f92d7a1Adam Roben
Merge pull request #788 from sjwoodr/master 
Nov 27 2013
48b7b84b62d2Steve Woodruff
Java ME update for .mtj.tmp 
Nov 27 2013
277b8358f8c4Philipp Marek
Added file for Common Lisp. 
Nov 27 2013
e3fd04426861minsOne
Added ipa file to Objective-C.gitignore 
Nov 27 2013
513d1aab1f94Adam Roben
Merge pull request #876 from jmillerdesign/patch-2 
Nov 27 2013
413a9892b5e4J. Miller
Use absolute paths to the files to ignore 
Nov 27 2013
759bcc3e6246Adam Roben
Merge pull request #875 from four04/add-common-linux-compile-file-extensions 
Nov 27 2013
753c995244d9Adam Roben
Merge pull request #871 from mattrubin/master 
Nov 27 2013
c2c74647f25dAdam Roben
Merge pull request #869 from j4y/master 
Nov 27 2013
cbda8a4d7f2aAdam Roben
Merge pull request #870 from CaseyB/master 
Nov 27 2013
288442e18011Adam Roben
Merge pull request #866 from stefan-vatov/master 
Nov 27 2013
c76bbb50c05cKristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
6604167da55fAdam Roben
Merge pull request #864 from oschrenk/patch-4 
Nov 27 2013
a79b082024c3Kristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
43c205b5dfe4Adam Roben
Merge pull request #862 from jaseemabid/emacs 
Nov 27 2013
3fb1b419f204Adam Roben
Merge pull request #861 from jaseemabid/elisp 
Nov 27 2013
c8d99ff85725Kristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
8e9563a7c928Adam Roben
Merge pull request #856 from oschrenk/patch-3 
Nov 27 2013
cea67aabe0afAdam Roben
Merge pull request #853 from danieljabailey/master 
Nov 27 2013
0bd7638db905Adam Roben
Merge pull request #852 from kdeldycke/patch-1 
Nov 27 2013
a07745af8bb2Adam Roben
Merge pull request #851 from rsolomo/patch-1 
Nov 27 2013
8cc9533f3481Adam Roben
Merge pull request #850 from Jiri-Kremser/master 
Nov 27 2013
926389c7ccb6Adam Roben
Merge pull request #849 from Danimoth/patch-1 
Nov 27 2013
38488f24407eKristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
80f79ec2af03Adam Roben
Merge pull request #536 from troii/gradle 
Nov 27 2013
51a1221f5080Adam Roben
Merge pull request #835 from ggirou/master 
Nov 27 2013
93b7ac4c09b7Kristofer Rye
Merge branch 'master' into add-common-linux-compile-file-extensions 
Nov 27 2013
ddef3121c60bAdam Roben
Merge pull request #728 from zyrx/master 
Nov 27 2013
c16b3bb8cf33Kristofer Rye
Merge branch 'master' of git://github.com/github/gitignore into add-common… 
Nov 27 2013
ecfdeba71ed8Adam Roben
Merge pull request #817 from jimmyandrade/patch-1 
Nov 27 2013
5e5dd80518e4Adam Roben
Merge pull request #812 from sableloki/patch-for-yeoman 
Nov 27 2013
06a3ead3d1ebAdam Roben
Merge pull request #800 from johnkharvey/stella 
Nov 27 2013
741defffddbeAdam Roben
Merge pull request #806 from torokmark/master 
Nov 27 2013
4424d80352eeAdam Roben
Merge pull request #789 from Lance0312/archlinuxpkg 
Nov 27 2013
82c8b636e9daAdam Roben
Merge pull request #777 from fivef/master 
Nov 27 2013
bb53647b8ab8Adam Roben
Merge pull request #726 from jtimberman/chef-cookbook 
Nov 27 2013
0ecd3eed9910Matt Rubin
Remove duplicate line in Objective-C.gitignore 
Nov 25 2013
6131fd3bccfaBorders, Casey
Ignore MonoDevelop cache files 
Nov 22 2013
e884da3fd3e4Jay Prall
plugin.xml shouldn't be in source control 
Nov 22 2013
4462ee9f9fdfOliver Schrenk
Ignore worksheet directory 
Nov 20 2013
882b876005bdJaseem Abid
Ignore file for elisp projects 
Nov 19 2013
f2656a471618Oliver Schrenk
Ignore files created by maven-release-plugin 
Nov 15 2013
207cddf155acJaseem Abid
Ignore elpa and eshell generated files 
Nov 14 2013
f0f5e38db203Justin Spahr-Summers
Merge pull request #760 
Nov 13 2013
4a7ab0638292Justin Spahr-Summers
Remove generic and Java ignore patterns 
Nov 13 2013
e57da65843ecunknown
Moved file to Global 
Nov 13 2013
27569799cb61Daniel Bailey
Added lazarus ignore file in the global dir this time 
Nov 13 2013
b10fa9c7d63bDaniel Bailey
Merge branch 'master' of https://github.com/github/gitignore 
Nov 13 2013