summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-05-11 12:27:15 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-05-11 12:27:15 -0700
commit7e759fbd60a8483d2865572df85c2835756f2ae8 (patch)
treea70a055ac60ac125630021ae0c5bdb34de31437a /.mailmap
parent9c3392cb3a23f6e681b9110284417db5b34e3793 (diff)
downloadexternal_mesa3d-7e759fbd60a8483d2865572df85c2835756f2ae8.zip
external_mesa3d-7e759fbd60a8483d2865572df85c2835756f2ae8.tar.gz
external_mesa3d-7e759fbd60a8483d2865572df85c2835756f2ae8.tar.bz2
.mailmap: Use Connor Abbott's personal e-mail
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 10811c0..242e88e 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>