summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2021-07-08 15:35:43 -0500
committerMarge Bot <eric+marge@anholt.net>2021-07-12 23:45:34 +0000
commitdbc5db11e5a5de816e7f247b4bddae1103ab2ba4 (patch)
tree29c7fd39e6db3f115d6e2f06f1fce476559e3152 /.mailmap
parentab2cd532ba336d873c8f6b43e5bfb35fe1e7bdc5 (diff)
mailmap: Update for Emma's new e-mail address
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Acked-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11788>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 8357ad838d2..90838e4079b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -213,7 +213,8 @@ 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>
+Emma Anholt <emma@anholt.net> <anholt@FreeBSD.org>
+Emma Anholt <emma@anholt.net> <eric@anholt.net>
Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>
Eric Engestrom <eric@engestrom.ch> <eric.engestrom@intel.com>