projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ffa511)
.mailmap: update aliases for Pierre-Eric Pelloux-Prayer
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Mon, 16 Sep 2019 17:44:55 +0000 (19:44 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 16 Apr 2020 11:46:14 +0000 (11:46 +0000)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1999>

.mailmap patch | blob | history

diff --git a/.mailmap b/.mailmap
index 9e0c1af54655989d289783411aa31bf871ee7ac8..3f98fd39b60cc264a4af40c0e8f23d1c012066fc 100644 (file)
--- 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>