summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:49:20 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commit75f5fc3435b241c02417856d5b23e195bc1bbf36 (patch)
tree89b77e446945e0b4e351cb7434603887d2d85472 /.mailmap
parentcd4dfc157b22829db913c513f794792d43818624 (diff)
downloadmesa-75f5fc3435b241c02417856d5b23e195bc1bbf36.tar.gz
.mailmap: resolve duplicates for Emmanuel Vadot
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 791ef43a93e..c3bbf43c5ef 100644
--- a/.mailmap
+++ b/.mailmap
@@ -209,6 +209,8 @@ Emil Velikov <emil.l.velikov@gmail.com> <emmil.velikov@collabora.com>
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> <emmanuel.peyrot@collabora.com>
+Emmanuel Vadot <manu@FreeBSD.org> Emmanuel <manu@FreeBSD.org>
+
Eric Anholt <eric@anholt.net> Eric Anholt <anholt@FreeBSD.org>
Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>