Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore
Description
Description
Details
Details
- Committed
Sean Brewer <seabre986@gmail.com> Nov 8 2013, 03:50 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNOREbd8dab38455b: Merge pull request #509 from cjerdonek/master
rGITIGNORE00db51bba6cd: Ignore Leiningen REPL history - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| bd8dab38455b | Carl Suster | Merge pull request #509 from cjerdonek/master | Nov 8 2013 | |||
| c038e773de33 | Chris Jerdonek | Make Python .gitignore directory entries match only directories. | Nov 8 2013 | |||
| b65855ee93eb | Adam Roben | Merge pull request #636 from msgerbush/patch-1 | Nov 7 2013 | |||
| 95075cccba0e | Michael Gerbush | Merge branch 'master' into patch-1 | Nov 7 2013 | |||
| 7bbc288b5277 | Adam Roben | Merge pull request #501 from karenetheridge/master | Nov 7 2013 | |||
| f94c2a0b7937 | Adam Roben | Merge pull request #505 from abrodkin/qt-additions | Nov 7 2013 | |||
| 6309a0abeae7 | Adam Roben | Merge pull request #522 from zellux/master | Nov 7 2013 | |||
| d9b3471c1fb7 | Adam Roben | Merge pull request #379 from azzlack/master | Nov 7 2013 | |||
| f4b8c4817b3c | Adam Roben | Merge pull request #503 from SimonSimCity/master | Nov 7 2013 | |||
| 834dc0a18300 | Adam Roben | Merge pull request #346 from bripkens/patch-1 | Nov 7 2013 | |||
| 9338b030e7a8 | Adam Roben | Merge pull request #352 from ghost/master | Nov 7 2013 | |||
| 320a2c4ef444 | Adam Roben | Merge pull request #350 from r1pp3rj4ck/patch-1 | Nov 7 2013 | |||
| eb49a83cbaa4 | Adam Roben | Merge pull request #343 from jcowgill/master | Nov 7 2013 | |||
| f5a760d2566d | Carl Suster | Merge pull request #634 from nikr/patch-1 | Nov 7 2013 | |||
| f0036b5a401a | Niklas Rehfeld/Nik | add .brf for files generated by hyperref | Nov 7 2013 | |||
| 48c388942c8e | Carl Suster | Merge pull request #453 from oschrenk/patch-1 | Nov 7 2013 | |||
| 1db3f61e98c2 | Carl Suster | Merge pull request #618 from rayshan/patch-1 | Nov 7 2013 | |||
| b0e2d94e53c2 | Carl Suster | Merge pull request #767 from lunks/remove-dot-project-from-rails-gitignore | Nov 7 2013 | |||
| db625a1012e9 | Carl Suster | Merge pull request #643 from stationkeeping/patch-1 | Nov 7 2013 | |||
| 49d7fbfc8cd4 | Adam Roben | Merge pull request #821 from healsdata/master | Nov 6 2013 | |||
| c1af2ae82918 | Jonathan Campbell | Allow the Vagrantfile to be tracked as that's the intended purpose. | Nov 6 2013 | |||
| 8e101905d6b4 | Carl Suster | Merge pull request #398 from huxuan/master | Nov 6 2013 | |||
| de4f9eff4f2d | Carl Suster | Merge pull request #438 from ChristianBoehlke/master | Nov 6 2013 | |||
| 7e4feaf658d1 | Justin Spahr-Summers | Merge pull request #315 from torbjoernk/global_add_kdevelop | Nov 5 2013 | |||
| 6188909b96c8 | Coby Chapple | Merge pull request #826 from cobyism/rework-contributing-guides | Nov 5 2013 | |||
| 7375f82fac98 | Coby Chapple | extract out new contributing guidelines to CONTRIBUTING.md | Nov 5 2013 | |||
| 798d9f15c247 | Adam Roben | Merge pull request #302 from bakkdoor/master | Nov 5 2013 | |||
| 1099dea39f81 | Adam Roben | Merge pull request #300 from pangratz/add_texlipse | Nov 5 2013 | |||
| 47ebff05b6f1 | Adam Roben | Merge pull request #232 from tomparle/patch-1 | Nov 5 2013 | |||
| 7ff92c890a2f | Adam Roben | Merge pull request #820 from harshadsabne/master | Nov 5 2013 | |||
| 5d2836f9b900 | Adam Roben | Merge pull request #825 from tamird/patch-1 | Nov 5 2013 | |||
| 908bb556d14d | Adam Roben | Merge pull request #827 from trevorsheridan/master | Nov 5 2013 | |||
| b5f5b0f2ea6f | Adam Roben | Merge pull request #693 from nichtich/patch-1 | Nov 5 2013 | |||
| fa55a30a46f3 | Adam Roben | Merge pull request #434 from Skyr/master | Nov 5 2013 | |||
| 02aa9eb7a8b2 | Stefan Schlott | Ignore cache and history (created by SBT >=0.12) | Nov 5 2013 | |||
| ad1a26d50df7 | Coby Chapple | add a section about not including every template under the sun | Nov 5 2013 | |||
| ede3453e1493 | Coby Chapple | reword one-file-per-commit guideline to be about keeping PRs atomic | Nov 5 2013 | |||
| 6665f370271c | Markus Olsson | Merge pull request #526 from bdukes/patch-2 | Nov 4 2013 | |||
| ebe2e3e57034 | Trevor Sheridan | Cleaning up Objective-C .gitignore and adding OS X section | Nov 4 2013 | |||
| 3d73f986a6d6 | Brendan Forster | Merge pull request #780 from juristr/patch-1 | Nov 4 2013 | |||
| c31d59e948cd | Markus Olsson | Merge pull request #824 from jamie-humphries/master | Nov 4 2013 | |||
| 26367930799f | Tamir Duberstein | Update Scala.gitignore | Nov 4 2013 | |||
| 505a14fbf1d3 | Coby Chapple | start reworking README to better articulate some contributing guidelines | Nov 4 2013 | |||
| 517a44470344 | Adam Roben | Merge pull request #713 from titanous/patch-1 | Nov 4 2013 | |||
| 3523237d7bd0 | James Cowgill | Merge remote-tracking branch 'upstream/master' | Nov 4 2013 | |||
| 9f14e41dc646 | Adam Roben | Merge pull request #822 from IconoclastLabs/master | Nov 4 2013 | |||
| 364479bc2a62 | Jamie Humphries | Add Visual Studio ignore rule for files generated by Microsoft Fakes. | Nov 4 2013 | |||
| 9fd7b32f58e7 | Adam Roben | Merge pull request #765 from martinblech/patch-1 | Nov 4 2013 | |||
| 464ae2642b5f | Martín Blech/Martin Blech | Ignoring [._]*.sw[a-p] instead of *.s[a-w][a-z] | Nov 4 2013 | |||
| 8e05c7362184 | Adam Roben | Merge pull request #823 from snisarg/master | Nov 4 2013 |