summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:51:12 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commit4fd9f4beb63c8bc018c5ecda7045652cc17c9201 (patch)
tree2692e18faa7cf3184b3254412d9809a5147d6577 /.mailmap
parent00aefdfea6d6e9774c4f1ae077a6dea551df5354 (diff)
downloadmesa-4fd9f4beb63c8bc018c5ecda7045652cc17c9201.tar.gz
.mailmap: resolve duplicates for Mark Menzynski
Signed-off-by: Andres Gomez <agomez@igalia.com> Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 9313abf3faa..53b1c75542a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -409,6 +409,8 @@ Marek Olšák <maraeo@gmail.com> <marek.olsak@amd.com>
Mario Kleiner <mario.kleiner.de@gmail.com> kleinerm <mario.kleiner@tuebingen.mpg.de>
Mario Kleiner <mario.kleiner.de@gmail.com> <mario.kleiner@tuebingen.mpg.de>
+Mark Menzynski <mmenzyns@redhat.com> mmenzyns <mmenzyns@redhat.com>
+
Mark Mueller <markkmueller@gmail.com> <MarkKMueller@gmail.com>
Marta Lofstedt <marta.lofstedt@intel.com> <marta.lofstedt@linux.intel.com>