X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=ded62585d9f7750ee185eaa4338610390d5598ed;hb=8a723282e3f7a312ab0ca3aa9157e5b76ec182af;hp=a31a8178cad6e1c832bd20bb7f3b293920a91f5b;hpb=b7baf707789c2a9814e725cdc9551961a3a2788e;p=mesa.git

diff --git a/.mailmap b/.mailmap
index a31a8178cad..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>
 
@@ -173,6 +175,8 @@ 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>
@@ -191,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>
 
@@ -461,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>