From: Eric Engestrom <eric@igalia.com>
Date: Wed, 24 May 2023 11:35:17 +0000 (+0100)
Subject: mailmap: update @mupuf's name
X-Git-Tag: upstream/23.3.3~8144
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7ae6932d474acd0e851ea944707732edeae44f75;p=platform%2Fupstream%2Fmesa.git

mailmap: update @mupuf's name

There were a number of variants in the git history:

    Martin Peres <martin.peres@linux.intel.com>
    Martin Peres <martin.peres@mupuf.org>
    Martin Roukala (néé Peres) <martin.roukala@mupuf.org>
    Martin Roukala (né Peres) <martin.roukala@mupuf.org>

Last one is the current one, so let's normalize the rest to that.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23229>
---

diff --git a/.mailmap b/.mailmap
index 5f7b791..6cadbfe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -429,7 +429,10 @@ Mark Mueller <markkmueller@gmail.com> <MarkKMueller@gmail.com>
 
 Marta Lofstedt <marta.lofstedt@intel.com> <marta.lofstedt@linux.intel.com>
 
-Martin Peres <martin.peres@linux.intel.com> <martin.peres@labri.fr>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@mupuf.org>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@linux.intel.com>
+Martin Roukala (né Peres) <martin.roukala@mupuf.org> <martin.peres@labri.fr>
 
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@gmx.net>
 Mathias Fröhlich <mathias.froehlich@gmx.net> Mathias Froehlich <Mathias.Froehlich@web.de>