Homec4science

Merge with latest master from upstream. Fix merge conflict with Leiningen.

Authored by Sean Brewer <seabre986@gmail.com> on Nov 8 2013, 03:50.

Description

Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore

Event Timeline

Sean Brewer <seabre986@gmail.com> committed rGITIGNOREe4cc7a56ba06: Merge with latest master from upstream. Fix merge conflict with Leiningen. (authored by Sean Brewer <seabre986@gmail.com>).Nov 8 2013, 03:50

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
bd8dab38455bCarl Suster
Merge pull request #509 from cjerdonek/master 
Nov 8 2013
c038e773de33Chris Jerdonek
Make Python .gitignore directory entries match only directories. 
Nov 8 2013
b65855ee93ebAdam Roben
Merge pull request #636 from msgerbush/patch-1 
Nov 7 2013
95075cccba0eMichael Gerbush
Merge branch 'master' into patch-1 
Nov 7 2013
7bbc288b5277Adam Roben
Merge pull request #501 from karenetheridge/master 
Nov 7 2013
f94c2a0b7937Adam Roben
Merge pull request #505 from abrodkin/qt-additions 
Nov 7 2013
6309a0abeae7Adam Roben
Merge pull request #522 from zellux/master 
Nov 7 2013
d9b3471c1fb7Adam Roben
Merge pull request #379 from azzlack/master 
Nov 7 2013
f4b8c4817b3cAdam Roben
Merge pull request #503 from SimonSimCity/master 
Nov 7 2013
834dc0a18300Adam Roben
Merge pull request #346 from bripkens/patch-1 
Nov 7 2013
9338b030e7a8Adam Roben
Merge pull request #352 from ghost/master 
Nov 7 2013
320a2c4ef444Adam Roben
Merge pull request #350 from r1pp3rj4ck/patch-1 
Nov 7 2013
eb49a83cbaa4Adam Roben
Merge pull request #343 from jcowgill/master 
Nov 7 2013
f5a760d2566dCarl Suster
Merge pull request #634 from nikr/patch-1 
Nov 7 2013
f0036b5a401aNiklas Rehfeld/Nik
add .brf for files generated by hyperref 
Nov 7 2013
48c388942c8eCarl Suster
Merge pull request #453 from oschrenk/patch-1 
Nov 7 2013
1db3f61e98c2Carl Suster
Merge pull request #618 from rayshan/patch-1 
Nov 7 2013
b0e2d94e53c2Carl Suster
Merge pull request #767 from lunks/remove-dot-project-from-rails-gitignore 
Nov 7 2013
db625a1012e9Carl Suster
Merge pull request #643 from stationkeeping/patch-1 
Nov 7 2013
49d7fbfc8cd4Adam Roben
Merge pull request #821 from healsdata/master 
Nov 6 2013
c1af2ae82918Jonathan Campbell
Allow the Vagrantfile to be tracked as that's the intended purpose. 
Nov 6 2013
8e101905d6b4Carl Suster
Merge pull request #398 from huxuan/master 
Nov 6 2013
de4f9eff4f2dCarl Suster
Merge pull request #438 from ChristianBoehlke/master 
Nov 6 2013
7e4feaf658d1Justin Spahr-Summers
Merge pull request #315 from torbjoernk/global_add_kdevelop 
Nov 5 2013
6188909b96c8Coby Chapple
Merge pull request #826 from cobyism/rework-contributing-guides 
Nov 5 2013
7375f82fac98Coby Chapple
extract out new contributing guidelines to CONTRIBUTING.md 
Nov 5 2013
798d9f15c247Adam Roben
Merge pull request #302 from bakkdoor/master 
Nov 5 2013
1099dea39f81Adam Roben
Merge pull request #300 from pangratz/add_texlipse 
Nov 5 2013
47ebff05b6f1Adam Roben
Merge pull request #232 from tomparle/patch-1 
Nov 5 2013
7ff92c890a2fAdam Roben
Merge pull request #820 from harshadsabne/master 
Nov 5 2013
5d2836f9b900Adam Roben
Merge pull request #825 from tamird/patch-1 
Nov 5 2013
908bb556d14dAdam Roben
Merge pull request #827 from trevorsheridan/master 
Nov 5 2013
b5f5b0f2ea6fAdam Roben
Merge pull request #693 from nichtich/patch-1 
Nov 5 2013
fa55a30a46f3Adam Roben
Merge pull request #434 from Skyr/master 
Nov 5 2013
02aa9eb7a8b2Stefan Schlott
Ignore cache and history (created by SBT >=0.12) 
Nov 5 2013
ad1a26d50df7Coby Chapple
add a section about not including every template under the sun 
Nov 5 2013
ede3453e1493Coby Chapple
reword one-file-per-commit guideline to be about keeping PRs atomic 
Nov 5 2013
6665f370271cMarkus Olsson
Merge pull request #526 from bdukes/patch-2 
Nov 4 2013
ebe2e3e57034Trevor Sheridan
Cleaning up Objective-C .gitignore and adding OS X section 
Nov 4 2013
3d73f986a6d6Brendan Forster
Merge pull request #780 from juristr/patch-1 
Nov 4 2013
c31d59e948cdMarkus Olsson
Merge pull request #824 from jamie-humphries/master 
Nov 4 2013
26367930799fTamir Duberstein
Update Scala.gitignore 
Nov 4 2013
505a14fbf1d3Coby Chapple
start reworking README to better articulate some contributing guidelines 
Nov 4 2013
517a44470344Adam Roben
Merge pull request #713 from titanous/patch-1 
Nov 4 2013
3523237d7bd0James Cowgill
Merge remote-tracking branch 'upstream/master' 
Nov 4 2013
9f14e41dc646Adam Roben
Merge pull request #822 from IconoclastLabs/master 
Nov 4 2013
364479bc2a62Jamie Humphries
Add Visual Studio ignore rule for files generated by Microsoft Fakes. 
Nov 4 2013
9fd7b32f58e7Adam Roben
Merge pull request #765 from martinblech/patch-1 
Nov 4 2013
464ae2642b5fMartín Blech/Martin Blech
Ignoring [._]*.sw[a-p] instead of *.s[a-w][a-z] 
Nov 4 2013
8e05c7362184Adam Roben
Merge pull request #823 from snisarg/master 
Nov 4 2013