Skip to content

Commit

Permalink
Shift copyright info to CONTRIBUTORS.md
Browse files Browse the repository at this point in the history
I accepted #151 which included
the request that Google Inc be added to the list of copyright holders. I won't
lie, I was a little worried about what the ramifications would be for this
project. I did a little research, and what I came up with was the following:

1. Yes, unless otherwise dealt with contributors have copyright on the lines
  of code they contributed to the project
2. Much of this hasn't been tested in court
* Specifying "and contributors" and listing them in a separate document is
  *probably* okay

Given the choice between not accepting PRs due to fears that someone's
employer would try to sue the pants off me, and just doing the best I can and
hoping that Google doesn't try to start something... well. I'm doing the best
I can.

Please don't sue me, Google.
  • Loading branch information
jfhbrook committed Sep 14, 2015
1 parent 528d832 commit 7497273
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Expand Up @@ -63,6 +63,8 @@ changelog additions and the version bump, and this breaks down when there are
interstitial commits making updates to either.
3. In case you were wondering about dependencies, you may find this helpful:
[![dependencies status](https://david-dm.org/jfhbrook/node-ecstatic.svg)](https://david-dm.org/jfhbrook/node-ecstatic)
4. Please add yourself to CONTRIBUTORS.md if you haven't done so! Fill in as
much as makes you comfortable.

## Pull Request

Expand Down
54 changes: 54 additions & 0 deletions CONTRIBUTORS.md
@@ -0,0 +1,54 @@
General format is: contributor, github handle, email. In some cases, the
contributor field is an organization instead of an actual person---this is for
cases where the work was done on behalf of the organization, ie as part of
their job. In others, no contributor field and/or email is shown---this is
because this list was partially (mostly) reconstructed from github commit
information and the person's real life name and email are unknown.

Listed in no particular order:

* Joshua Holbrook @jfhbrook <josh.holbrook@gmail.com>
* Jon Ege Ronnenberg @dotnetCarpenter <jon.ronnenberg@gmail.com>
* James Halliday @substack <substack@gmail.com>
* Jonah Ruiz @jonahoffline <jonah@pixelhipsters.com>
* Jacob Burden @jekrb <Jacob.JW.Burden@gmail.com>
* @leesei
* @SirAnthony
* Frank Mecklenburg @yfr <mecklenburg@ubilabs.net>
* @curimit <curimit@gmail.com>
* Dominic Tarr @dominictarr
* Chew Choon Keat @choonkeat <choonkeat@gmail.com>
* Lars Kappert @webpro <lars@webpro.nl>
* Alan Reyes @KuttKatrea <kutt@katrea.net>
* Colin Fallon @colinf
* Charlie Robbins @indexzero
* Ville Salonen @VilleSalonen
* Tom Steele @tomsteele <thomasjsteele@gmail.com>
* Maciej Małecki @mmalecki <me@mmalecki.com>
* Chris Bannister @Zariel <c.bannister@gmail.com>
* Shinnosuke Watanabe @shinnn <snnskwtnb@gmail.com>
* Adam Brady @SomeoneWeird <adam@boxxen.org>
* Christian Howe @coderarity
* Arnaud @amelon
* Gilad Peleg @pgilad <giladp007@gmail.com>
* Brad Dunbar @braddunbar <dunbarb2@gmail.com>
* Google Inc. via Jeremy Banks @jre-g <jre@google.com>
* @sundippatel
* Arjan van Wijk @ThaNarie <thanarie@gmail.com>
* Mathias Buus @mafintosh <mathiasbuus@gmail.com>
* Farrin Reid @blakmatrix <blakmatrix@gmail.com>
* Tõnis Tiigi @tonistiigi <tonistiigi@gmail.com>
* Maksim Lin @maks <maks@manichord.com>
* Jan Nicklas @jantimon
* David Cox @losttime <losttime.shuffle@gmail.com>
* Bill Ticehurst @billti <billti@hotmail.com>
* Vincent Voyer @vvo <vincent.voyer@gmail.com>
* @helloyou2012 <helloyou2012@gmail.com>
* Domenic Denicola @domenic <d@domenic.me>
* Maxim Ivanov @redbaron <ivanov.maxim@gmail.com>
* Oliver Joseph Ash @OliverJAsh <oliverjash@gmail.com>
* Benjamin Tan @d10 <demoneaux@gmail.com>
* D Scott Boyce @scobo
* Zach Bruggerman @remixz <mail@bruggie.com>
* Mathias Bynens @mathiasbynens

3 changes: 1 addition & 2 deletions LICENSE.txt
@@ -1,7 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2015 Joshua Holbrook, Jon Ege Ronnenberg, James Halliday,
and Google Inc.
Copyright (c) 2013-2015 Joshua Holbrook and contributors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -193,4 +193,4 @@ contributing, take a quick look at the contributing guidelines in

# License:

MIT.
MIT. See LICENSE.txt. For contributors, see CONTRIBUTORS.md

0 comments on commit 7497273

Please sign in to comment.