Index: source/libvpx/.mailmap |
diff --git a/source/libvpx/.mailmap b/source/libvpx/.mailmap |
index fb82a24e34512f88d07735c7480c2a7b3c16afee..0bfda120f9886993f8c2c1d3a3caf8aa03bcaa2c 100644 |
--- a/source/libvpx/.mailmap |
+++ b/source/libvpx/.mailmap |
@@ -1,18 +1,26 @@ |
Adrian Grange <agrange@google.com> |
+Alex Converse <aconverse@google.com> <alex.converse@gmail.com> |
Alexis Ballier <aballier@gentoo.org> <alexis.ballier@gmail.com> |
+Alpha Lam <hclam@google.com> <hclam@chromium.org> |
+Deb Mukherjee <debargha@google.com> |
+Erik Niemeyer <erik.a.niemeyer@intel.com> <erik.a.niemeyer@gmail.com> |
+Guillaume Martres <gmartres@google.com> <smarter3@gmail.com> |
Hangyu Kuang <hkuang@google.com> |
Jim Bankoski <jimbankoski@google.com> |
-John Koleszar <jkoleszar@google.com> |
Johann Koenig <johannkoenig@google.com> |
Johann Koenig <johannkoenig@google.com> <johann.koenig@duck.com> |
-Johann Koenig <johannkoenig@google.com> <johannkoenig@dhcp-172-19-7-52.mtv.corp.google.com> |
+John Koleszar <jkoleszar@google.com> |
+Joshua Litt <joshualitt@google.com> <joshualitt@chromium.org> |
+Marco Paniconi <marpan@google.com> |
+Marco Paniconi <marpan@google.com> <marpan@chromium.org> |
Pascal Massimino <pascal.massimino@gmail.com> |
+Paul Wilkins <paulwilkins@google.com> |
+Ralph Giles <giles@xiph.org> <giles@entropywave.com> |
+Ralph Giles <giles@xiph.org> <giles@mozilla.com> |
Sami Pietilä <samipietila@google.com> |
+Tamar Levy <tamar.levy@intel.com> |
+Tamar Levy <tamar.levy@intel.com> <levytamar82@gmail.com> |
Tero Rintaluoma <teror@google.com> <tero.rintaluoma@on2.com> |
Timothy B. Terriberry <tterribe@xiph.org> Tim Terriberry <tterriberry@mozilla.com> |
Tom Finegan <tomfinegan@google.com> |
-Ralph Giles <giles@xiph.org> <giles@entropywave.com> |
-Ralph Giles <giles@xiph.org> <giles@mozilla.com> |
-Alpha Lam <hclam@google.com> <hclam@chromium.org> |
-Deb Mukherjee <debargha@google.com> |
Yaowu Xu <yaowu@google.com> <yaowu@xuyaowu.com> |