summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:52:57 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commit4752ef5039011ad8f305a769bb9ea4b867db000b (patch)
tree93bba0a5852ca873561369976e02c3e1ad98c1f5 /.mailmap
parent8481d5f4d029a7932145ac96bfb0a9da57dc7cd9 (diff)
.mailmap: resolve duplicates for Satyeshwar Singh
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 b2f55c61b6d..05e9aab707b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -563,6 +563,8 @@ Samuel Iglesias Gonsálvez <siglesias@igalia.com> Samuel Iglesias Gonsalvez <sig
Samuel Li <samuel.li@amd.com> <Samuel.Li@amd.com>
+Satyeshwar Singh <satyeshwar.singh@intel.com> Singh, Satyeshwar <satyeshwar.singh@intel.com>
+
Sean D'Epagnier <sean@depagnier.com> <geckosenator@freedesktop.org>
Serge Martin <edb+mesa@sigluy.net> Serge Martin (EdB) <edb+mesa@sigluy.net>