aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2011-03-05 14:24:26 -0500
committerRuss Cox <rsc@golang.org>2011-03-05 14:24:26 -0500
commitd42bfe26ad003cf2c29dc1b8cf21026f4a2a8fb9 (patch)
tree146780087562663d15a9f8feaee8144d2a80046c
parent633df67b66da4679dcb6b00590cf3f62aff8ddf1 (diff)
downloadgo-d42bfe26ad003cf2c29dc1b8cf21026f4a2a8fb9.tar.gz
go-d42bfe26ad003cf2c29dc1b8cf21026f4a2a8fb9.zip
A+C: Pascal S. de Kloe (individual CLA)
R=r CC=golang-dev https://golang.org/cl/4266041
-rw-r--r--AUTHORS3
-rw-r--r--CONTRIBUTORS3
2 files changed, 4 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 925c515c83..cb59837d8d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,10 +27,10 @@ Ben Olive <sionide21@gmail.com>
Benny Siegert <bsiegert@gmail.com>
Caine Tighe <arctanofyourface@gmail.com>
Charles L. Dorian <cldorian@gmail.com>
+Chris Dollin <ehog.hedge@gmail.com>
Chris Jones <chris@cjones.org>
Chris Lennert <calennert@gmail.com>
Christian Himpel <chressie@googlemail.com>
-Chris Dollin <ehog.hedge@gmail.com>
Christopher Nielsen <m4dh4tt3r@gmail.com>
Christopher Wedgwood <cw@f00f.org>
Clement Skau <clementskau@gmail.com>
@@ -98,6 +98,7 @@ Nigel Kerr <nigel.kerr@gmail.com>
Olivier Antoine <olivier.antoine@gmail.com>
Padraig Kitterick <padraigkitterick@gmail.com>
Paolo Giarrusso <p.giarrusso@gmail.com>
+Pascal S. de Kloe <pascal@quies.net>
Patrick Gavlin <pgavlin@gmail.com>
Petar Maymounkov <petarm@gmail.com>
Peter Froehlich <peter.hans.froehlich@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5cad64721a..a20f8fedef 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -61,10 +61,10 @@ Brendan O'Dea <bod@golang.org>
Caine Tighe <arctanofyourface@gmail.com>
Cary Hull <chull@google.com>
Charles L. Dorian <cldorian@gmail.com>
+Chris Dollin <ehog.hedge@gmail.com>
Chris Jones <chris@cjones.org> <chris.jones.yar@gmail.com>
Chris Lennert <calennert@gmail.com>
Christian Himpel <chressie@googlemail.com> <chressie@gmail.com>
-Chris Dollin <ehog.hedge@gmail.com>
Christopher Nielsen <m4dh4tt3r@gmail.com>
Christopher Wedgwood <cw@f00f.org>
Clement Skau <clementskau@gmail.com>
@@ -148,6 +148,7 @@ Nigel Tao <nigeltao@golang.org>
Olivier Antoine <olivier.antoine@gmail.com>
Padraig Kitterick <padraigkitterick@gmail.com>
Paolo Giarrusso <p.giarrusso@gmail.com>
+Pascal S. de Kloe <pascal@quies.net>
Patrick Gavlin <pgavlin@gmail.com>
Petar Maymounkov <petarm@gmail.com>
Peter Froehlich <peter.hans.froehlich@gmail.com>