X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=ded62585d9f7750ee185eaa4338610390d5598ed;hb=a89153d03815dfe56d5521276eaad8cd9087ee0d;hp=744e79f1ce2da4a58ac167a5ff118eea181496ff;hpb=ea74b1b9aaeb3e1d5df51e0ff1dc7810a3fb759e;p=mesa.git

diff --git a/.mailmap b/.mailmap
index 744e79f1ce2..ded62585d9f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,6 +26,8 @@ Alexander Monakov <amonakov@gmail.com> <amonakov@ispras.ru>
 
 Alexander von Gluck IV <kallisti5@unixzen.com> Alexander von Gluck <kallisti5@unixzen.com>
 
+Alexandros Frantzis <alexandros.frantzis@collabora.com> <Alexandros.Frantzis@canonical.com>
+
 Alex Corscadden <alexc@vmware.com> <alexc@alexc-dev1.prom.eng.vmware.com>
 Alex Corscadden <alexc@vmware.com> <alexc@alexc-dev1.vmware.com>
 
@@ -50,6 +52,8 @@ Andrew Randrianasulu <randrianasulu@gmail.com> <randrik@mail.ru>
 
 Arthur Huillet <arthur.huillet@free.fr> Arthur HUILLET <arthur.huillet@free.fr>
 
+Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> <basni@chromium.org>
+
 Benjamin Franzke <benjaminfranzke@googlemail.com> ben <benjaminfranzke@googlemail.com>
 
 Ben Skeggs <bskeggs@redhat.com> <darktama@beleth.(none)>
@@ -142,6 +146,8 @@ Dylan Baker <dylanx.c.baker@intel.com> <baker.dylan.c@gmail.com>
 
 Edward O'Callaghan <funfunctor@folklore1984.net> <eocallaghan@alterapraxis.com>
 
+Elie Tournier <tournier.elie@gmail.com>
+
 Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com>
 
 Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>
@@ -163,10 +169,14 @@ Fabian Bieler <der.fabe@gmx.net> <&lt;der.fabe@gmx.net&gt>
 
 Feng, Haitao <haitao.feng@intel.com> Haitao Feng <haitao.feng@intel.com>
 
+Frank Binns <frank.binns@imgtec.com> <francisbinns@gmail.com>
+
 Frank Henigman <fjhenigman@google.com> <fjhenigman@chromium.org>
 
 George Sapountzis <gsapountzis@gmail.com> George Sapountzis <gsap7@yahoo.gr>
 
+Gert Wollny <gert.wollny@collabora.com> <gw.fossdev@gmail.com>
+
 Gwenole Beauchesne <gwenole.beauchesne@intel.com> <gb.devel@gmail.com>
 
 Hamish Marson <hmarson@users.sourceforge.net> hmarson <hmarson>
@@ -185,6 +195,8 @@ Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.(none)>
 Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.walkyrie.se>
 Jakob Bornecrantz <wallbraker@gmail.com> <jakob@tungstengraphics.com>
 Jakob Bornecrantz <wallbraker@gmail.com> <wallbraker 'at' gmail 'dot' com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob.bornecrantz@collabora.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@collabora.com>
 
 Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>
 
@@ -455,6 +467,8 @@ Tom Fogal <tfogal@alumni.unh.edu> <tfogal@sci.utah.edu>
 Tom Stellard <thomas.stellard@amd.com> <tstellar@gmail.com>
 Tom Stellard <thomas.stellard@amd.com> Thomas Stellard <tom.stellard@amd.com>
 
+Tomeu Vizoso <tomeu.vizoso@collabora.com> <tomeu@tomeuvizoso.net>
+
 Tormod Volden <debian.tormod@gmail.com> <lists.tormod@gmail.com>
 
 Török Edwin <edwin+mesa@etorok.net> Török Edvin <edwintorok@gmail.com>