Reconcile AUTHORS and CONTRIBUTORS files
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1269 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/AUTHORS b/AUTHORS
index 6b93e4c..0294632 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,15 +4,27 @@
# See the latter for an explanation.
# Names should be added to this file as
-# Name or Organization <email address>
-# The email address is not required for organizations.
-
-TransGaming Inc.
+# Name or Organization
+# Email addresses for individuals are tracked elsewhere to avoid spam.
Google Inc.
-
+TransGaming Inc.
3DLabs Inc. Ltd.
+Adobe Systems Inc.
+Autodesk, Inc.
Cloud Party, Inc.
+Intel Corporation
+Mozilla Corporation
+Turbulenz
-Jacek Caban <cjacek at gmail.com>
+Jacek Caban
+Mark Callow
+Ginn Chen
+James Hauxwell
+Sam Hocevar
+Pierre Leveille
+Boying Lu
+Aitor Moreno
+Yuri O'Donnell
+Josh Soref
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2a48979..16c819b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -17,9 +17,13 @@
Brent Austin
Michael Bai
John Bauman
+ Peter Beverloo
Steve Block
+ Rachel Blum
+ Eric Boren
Henry Bridge
Nat Duca
+ Peter Kasting
Vangelis Kokkevis
Zhenyao Mo
Daniel Nicoara
@@ -27,35 +31,38 @@
Alok Priyadarshi
Kenneth Russell
Brian Salomon
+ Gregg Tavares
+ Jeff Timanus
Ben Vanik
Adrienne Walker
- Eric Boren
-
-Mozilla Corp.
- Ehsan Akhgari
- Mike Hommey
- Benoit Jacob
- Makoto Kato
- Vladimir Vukicevic
-
-Apple Inc.
- David Kilzer
+ thestig@chromium.org
Adobe Systems Inc.
Alexandru Chiculita
Max Vujovic
+Autodesk, Inc.
+ Ranger Harke
+
Cloud Party, Inc.
Conor Dickinson
-Aitor Moreno <aitormoreno at gmail.com>
-Jim Hauxwell <james at dattrax.co.uk>
-ddefrostt
-timeless
-Yore Apex
-Mark Callow
-Yuriy O'Donnell
-Sam Hocevar
-Pierre Leveille
-Jin Yang
+Intel Corporation
+ Jin Yang
+ Andy Chen
+
+Mozilla Corp.
+ Ehsan Akhgari
+ Jeff Gilbert
+ Mike Hommey
+ Benoit Jacob
+ Makoto Kato
+ Vladimir Vukicevic
+
+Turbulenz
+ Michael Braithwaite
+
+Ulrik Persson (ddefrostt)
+Mark Banner (standard8mbp)
+David Kilzer
