summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2019-09-16 19:44:55 +0200
committerMarge Bot <eric+marge@anholt.net>2020-04-16 11:46:14 +0000
commitb42a25320e6d444f9fd90c2db12d209c4e87f286 (patch)
treebeaa475a88bcffc075cbdef87a245ded92228534 /.mailmap
parent3ffa511d60dbfa163e553d25cf2bcf45a569a777 (diff)
downloadmesa-b42a25320e6d444f9fd90c2db12d209c4e87f286.tar.gz
.mailmap: update aliases for Pierre-Eric Pelloux-Prayer
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1999>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 9e0c1af5465..3f98fd39b60 100644
--- a/.mailmap
+++ b/.mailmap
@@ -480,7 +480,8 @@ Peter Hutterer <peter.hutterer@who-t.net> <peter@cs.unisa.edu.au>
Philipp Zabel <p.zabel@pengutronix.de> <philipp.zabel@gmail.com>
-Pierre-Eric Pelloux-Prayer <pelloux@gmail.com> pepp <pelloux@gmail.com>
+Pierre-Eric Pelloux-Prayer <pelloux@gmail.com> <pelloux@gmail.com>
+Pierre-Eric Pelloux-Prayer <pelloux@gmail.com> <pierre-eric.pelloux-prayer@amd.com>
Pierre Willenbrock <pierre@pirsoft.de> Pierre Willenbrok <pierre@pirsoft.de>