Implemented frontbuffer rendering mode.

[platform/upstream/mesa.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 8357ad8..14a17b9 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -42,6 +42,8 @@ Alex Deucher <alexdeucher@gmail.com> <alex@cube.(none)>
 Alex Deucher <alexdeucher@gmail.com> <alex@samba.(none)>
 
 Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> <alyssa@rosenzweig.io>
+Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> <a@rosenzweig.io>
+Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> <alyssa@collabora.com>
 
 Andreas Fänger <a.faenger@e-sign.com> <a.faenger@e-sign.com>
 
@@ -63,7 +65,7 @@ Anuj Phogat <anuj.phogat@gmail.com> <anuj.phogat@intel.com>
 
 Arthur Huillet <arthur.huillet@free.fr> Arthur HUILLET <arthur.huillet@free.fr>
 
-Axel Davy <axel.davy@ens.fr> <davyaxel0@gmail.com>
+Axel Davy <davyaxel0@gmail.com> <axel.davy@ens.fr>
 
 Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> <basni@chromium.org>
 
@@ -105,6 +107,8 @@ Bruce Cherniak <bruce.cherniak@intel.com>
 
 Bruce Merry <bmerry@users.sourceforge.net> <bmerry@gmail.com>
 
+Caio Oliveira <caio.oliveira@intel.com>
+
 Carl-Philip Hänsch <cphaensch@googlemail.com>
 Carl-Philip Hänsch <cphaensch@googlemail.com> <s3734770@mail.zih.tu-dresden.de>
 Carl-Philip Hänsch <cphaensch@googlemail.com> <carli@carli-laptop.(none)>
@@ -157,7 +161,7 @@ Colin McDonald <cjmmail10-bz@yahoo.co.uk> <cjmcdonald@qinetiq.com>
 Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
 Connor Abbott <cwabbott0@gmail.com> <connor.abbott@intel.com>
 
-Constantine Kharlamov <Hi-Angel@yandex.ru>
+Konstantin Kharlamov <Hi-Angel@yandex.ru>
 
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomed...@gmail.com>
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomedude@gmail.com>
@@ -213,10 +217,12 @@ Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> <emmanuel.peyrot@collabora.com>
 
 Emmanuel Vadot <manu@FreeBSD.org> Emmanuel <manu@FreeBSD.org>
 
-Eric Anholt <eric@anholt.net> Eric Anholt <anholt@FreeBSD.org>
+Emma Anholt <emma@anholt.net> <anholt@FreeBSD.org>
+Emma Anholt <emma@anholt.net> <eric@anholt.net>
 
-Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>
-Eric Engestrom <eric@engestrom.ch> <eric.engestrom@intel.com>
+Eric Engestrom <eric@igalia.com> <eric@engestrom.ch>
+Eric Engestrom <eric@igalia.com> <eric.engestrom@imgtec.com>
+Eric Engestrom <eric@igalia.com> <eric.engestrom@intel.com>
 
 Erik Faye-Lund <kusmabite@gmail.com> <erik.faye-lund@collabora.com>
 
@@ -292,7 +298,8 @@ Jan Vesely <jano.vesely@gmail.com> Jan Vesely <jan.vesely@rutgers.edu>
 
 Jan Zielinski <jan.zielinski@intel.com> jzielins <jan.zielinski@intel.com>
 
-Jason Ekstrand <jason@jlekstrand.net> <jason.ekstrand@intel.com>
+Jason Ekstrand <jason.ekstrand@collabora.com> <jason@jlekstrand.net>
+Jason Ekstrand <jason.ekstrand@collabora.com> <jason.ekstrand@intel.com>
 
 Jeremy Huddleston <jeremyhu@apple.com>
 Jeremy Huddleston <jeremyhu@apple.com> <jeremyhu@freedesktop.org>