summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorFaith Ekstrand <faith.ekstrand@collabora.com>2023-01-30 17:02:20 -0600
committerMarge Bot <emma+marge@anholt.net>2023-01-31 01:17:07 +0000
commit03d1141e51dce519fbbb2c435d87a1bfc53fb51a (patch)
tree3a7c732532ac1fe83764d59f8ef5a453fe0e5a42 /.mailmap
parent29010669802ad1730bb74626d2df3453a047840f (diff)
downloadmesa-03d1141e51dce519fbbb2c435d87a1bfc53fb51a.tar.gz
mailmap: Remap e-mail addresses for Faith Ekstrand
Acked-by: Lina Versace <lina@kiwitree.net> Acked-by: Daniel Stone <daniels@collabora.com> Lovingly-reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Acked-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21000>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 14a17b903e4..ef4d15786b3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -298,8 +298,10 @@ Jan Vesely <jano.vesely@gmail.com> Jan Vesely <jan.vesely@rutgers.edu>
Jan Zielinski <jan.zielinski@intel.com> jzielins <jan.zielinski@intel.com>
-Jason Ekstrand <jason.ekstrand@collabora.com> <jason@jlekstrand.net>
-Jason Ekstrand <jason.ekstrand@collabora.com> <jason.ekstrand@intel.com>
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>
+Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>
+Faith Ekstrand <faith.ekstrand@collabora.com> <faith@gfxstrand.net>
Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston <jeremyhu@apple.com> <jeremyhu@freedesktop.org>