From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 11 May 2016 19:27:15 +0000 (-0700)
Subject: .mailmap: Use Connor Abbott's personal e-mail
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7e759fbd60a8483d2865572df85c2835756f2ae8;p=mesa.git

.mailmap: Use Connor Abbott's personal e-mail
---

diff --git a/.mailmap b/.mailmap
index 10811c065af..242e88ef2e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -111,8 +111,8 @@ Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Christop
 Claudio Ciccani <klan@directfb.org> <klan@users.sf.net>
 Claudio Ciccani <klan@directfb.org> <klan@users.sourceforge.net>
 
-Connor Abbott <connor.abbott@intel.com> <connor.w.abbott@intel.com>
-Connor Abbott <connor.abbott@intel.com> <cwabbott0@gmail.com>
+Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
+Connor Abbott <cwabbott0@gmail.com> <connor.abbott@intel.com>
 
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomed...@gmail.com>
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomedude@gmail.com>