summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorErik Faye-Lund <erik.faye-lund@collabora.com>2019-09-16 19:34:04 +0200
committerMarge Bot <eric+marge@anholt.net>2020-04-16 11:46:14 +0000
commit3223198b4d6b23408eee3d57beab86af71d4d160 (patch)
treee747b9e6234b5f1d367838a81358116613e1c87e /.mailmap
parent79bb330904acb945abd8e22dccfa15d77c837f12 (diff)
downloadmesa-3223198b4d6b23408eee3d57beab86af71d4d160.tar.gz
mesa-3223198b4d6b23408eee3d57beab86af71d4d160.tar.bz2
mesa-3223198b4d6b23408eee3d57beab86af71d4d160.zip
.mailmap: update aliases for Marc-André Lureau
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 0ffb341a38e..eae37e67bc6 100644
--- 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>