summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:50:08 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commit6c9660e424243c36673c0054c5559fd97bbf4960 (patch)
treee3db61eb653533c696757526eccb4fc8b0bace79 /.mailmap
parent64b415d96c47971c9c3504382641a4fb56054350 (diff)
downloadmesa-6c9660e424243c36673c0054c5559fd97bbf4960.tar.gz
mesa-6c9660e424243c36673c0054c5559fd97bbf4960.tar.bz2
mesa-6c9660e424243c36673c0054c5559fd97bbf4960.zip
.mailmap: resolve duplicates for James Xiong
Signed-off-by: Andres Gomez <agomez@igalia.com> Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e2c40289695..4d48cf814ab 100644
--- a/.mailmap
+++ b/.mailmap
@@ -280,6 +280,8 @@ Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>
James Legg <jlegg@feralinteractive.com> <lankyleggy@gmail.com>
+James Xiong <james.xiong@intel.com> Xiong, James <james.xiong@intel.com>
+
James Zhu <James.Zhu@amd.com>
Jan Beich <jbeich@freebsd.org> <jbeich@FreeBSD.org>