projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79bb330)
.mailmap: update aliases for Marc-André Lureau
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Mon, 16 Sep 2019 17:34:04 +0000 (19:34 +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 0ffb341a38e7170e63088c5b6bf0fd8439f59244..eae37e67bc6e441bfba7563889dfb9a07f9ae6f1 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -376,7 +376,8 @@ Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <maarten.lankhorst@canonical.co
 
 Maciej Cencora <m.cencora@gmail.com> <maciej@osiris.(none)>
 
-Marc-André Lureau <marcandre.lureau@gmail.com> Marc-Andre Lureau <marcandre.lureau@gmail.com>
+Marc-André Lureau <marcandre.lureau@gmail.com> <marcandre.lureau@gmail.com>
+Marc-André Lureau <marcandre.lureau@gmail.com> <marcandre.lureau@redhat.com>
 
 Marc Dietrich <marvin24@gmx.de> Marc <marvin24@gmx.de>
 Marc Dietrich <marvin24@gmx.de> marvin24 <marvin24@gmx.de>