From 6a33a08b45e4097dccbaf275398c6503d8f17aa6 Mon Sep 17 00:00:00 2001 From: mpl Date: Wed, 16 May 2012 11:56:35 +0200 Subject: [PATCH] AUTHORS Change-Id: I49c215d89aa7ad0c2611d7c739d60464e8199c60 --- AUTHORS | 17 +++++++++++++++++ CONTRIBUTORS | 23 +++++++++++++++-------- 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..0393c1ac5 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,17 @@ +# This is the official list of Camlistore authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS files. +# See the latter for an explanation. + +Amir Mohammad Saied +Amit Levy +Anthony Martin +Caine Tighe +Dean Landolt +Google Inc. +Iain Peet +Jrabbit +Julien Danjou +Mathieu Lonjaret +Philio +Ranveer +Robert Hencke diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d19086fbf..469ec35a4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,4 +1,7 @@ # People who have agreed to one of the CLAs and can contribute patches. +# The AUTHORS file lists the copyright holders; this file +# lists people. For example, Google employees are listed here +# but not in AUTHORS, because Google holds the copyright. # # http://code.google.com/legal/individual-cla-v1.0.html (electronic submission) # http://code.google.com/legal/corporate-cla-v1.0.html (requires FAX) @@ -7,20 +10,24 @@ # copyright _license_. You retain the copyright on your # contributions. -Brad Fitzpatrick -Brett Slatkin -Daniel Erat -Evan Martin Adam Langley Andrew Gerrand Amir Mohammad Saied +Amit Levy Anthony Martin +Brad Fitzpatrick +Brett Slatkin Caine Tighe +Daniel Erat Dean Landolt -Mathieu Lonjaret +Evan Martin +Han-Wen Nienhuys +Iain Peet +Jrabbit Julien Danjou Lindsey Simon -Iain Peet +Mathieu Lonjaret +Nigel Tao +Philio +Ranveer Robert Hencke -Amit Levy -Jrabbit