summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJason Ekstrand <jason@jlekstrand.net>2022-01-17 09:42:50 -0600
committerMarge Bot <emma+marge@anholt.net>2022-01-26 20:08:31 +0000
commitfe71f4d9ec7ed80f7dded7dc4f1667d1638efbc5 (patch)
tree4e4f13541946d16276216ac886e7ac5b74ab5d84 /.mailmap
parent96acd0933eeb638ce2399a2dd8bf03906c765120 (diff)
.mailmap: Switch Jason Ekstrand to @collabora.com
Jason is starting at Collabora on the 24th. More details at https://www.jlekstrand.net/jason/blog/2022/01/hello-collabora/ Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14586>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e8e087ba2d4..e7c1776f306 100644
--- a/.mailmap
+++ b/.mailmap
@@ -297,7 +297,8 @@ 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@jlekstrand.net> <jason.ekstrand@intel.com>
+Jason Ekstrand <jason.ekstrand@collabora.com> <jason@jlekstrand.net>
+Jason Ekstrand <jason.ekstrand@collabora.com> <jason.ekstrand@intel.com>
Jeremy Huddleston <jeremyhu@apple.com>
Jeremy Huddleston <jeremyhu@apple.com> <jeremyhu@freedesktop.org>