summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:50:28 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commit028ae10694e899468edb169780294f77b37c46d0 (patch)
tree2026cfb5985c3c95da293701881cc7045eb0ab1f /.mailmap
parent6c9660e424243c36673c0054c5559fd97bbf4960 (diff)
downloadmesa-028ae10694e899468edb169780294f77b37c46d0.tar.gz
mesa-028ae10694e899468edb169780294f77b37c46d0.tar.bz2
mesa-028ae10694e899468edb169780294f77b37c46d0.zip
.mailmap: resolve duplicates for Jan Zielinski
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 4d48cf814ab..742e9c0b353 100644
--- a/.mailmap
+++ b/.mailmap
@@ -288,6 +288,8 @@ Jan Beich <jbeich@freebsd.org> <jbeich@FreeBSD.org>
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>
Jeremy Huddleston <jeremyhu@apple.com>