summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:52:16 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commitcc1da67fd13212ece7fc19b697abaa9c0fc404dd (patch)
tree23ad8be33e24dae1830d20784f5f7397cfcb0d3e /.mailmap
parenta3d4c485979d74613a7edfa5847a5501123c6b36 (diff)
downloadmesa-cc1da67fd13212ece7fc19b697abaa9c0fc404dd.tar.gz
.mailmap: resolve duplicates for Maya Rashish
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 c8a23257b28..60f547cab16 100644
--- a/.mailmap
+++ b/.mailmap
@@ -435,6 +435,8 @@ Matthew W. S. Bell <matthew@bells23.org.uk> Matthew Bell <matthew@bells23.org.uk
Maxence Le Doré <maxence.ledore@gmail.com> Maxence Le Dore <maxence.ledore@gmail.com>
+Maya Rashish <coypu@sdf.org> coypu <coypu@sdf.org>
+
Micah Fedke <micah.fedke@collabora.co.uk> <M.Fedke@Astronautics.com>
Michal Krol <michal@vmware.com> <michal@tungstengraphics.com>