summaryrefslogtreecommitdiff
path: root/lib/mesa/.mailmap
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2023-01-28 08:15:04 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2023-01-28 08:15:04 +0000
commit1c5c7896c1d54abd25c0f33ca996165b359eecb3 (patch)
treebc5a10bbe89ecd4008a5bed7a029babc992f66b5 /lib/mesa/.mailmap
parentc55dff45ea3a2c70e45601240b248017acc48198 (diff)
Import Mesa 22.3.4
Diffstat (limited to 'lib/mesa/.mailmap')
-rw-r--r--lib/mesa/.mailmap9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/mesa/.mailmap b/lib/mesa/.mailmap
index e7c1776f3..14a17b903 100644
--- a/lib/mesa/.mailmap
+++ b/lib/mesa/.mailmap
@@ -65,7 +65,7 @@ Anuj Phogat <anuj.phogat@gmail.com> <anuj.phogat@intel.com>
Arthur Huillet <arthur.huillet@free.fr> Arthur HUILLET <arthur.huillet@free.fr>
-Axel Davy <axel.davy@ens.fr> <davyaxel0@gmail.com>
+Axel Davy <davyaxel0@gmail.com> <axel.davy@ens.fr>
Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> <basni@chromium.org>
@@ -161,7 +161,7 @@ Colin McDonald <cjmmail10-bz@yahoo.co.uk> <cjmcdonald@qinetiq.com>
Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
Connor Abbott <cwabbott0@gmail.com> <connor.abbott@intel.com>
-Constantine Kharlamov <Hi-Angel@yandex.ru>
+Konstantin Kharlamov <Hi-Angel@yandex.ru>
Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomed...@gmail.com>
Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomedude@gmail.com>
@@ -220,8 +220,9 @@ Emmanuel Vadot <manu@FreeBSD.org> Emmanuel <manu@FreeBSD.org>
Emma Anholt <emma@anholt.net> <anholt@FreeBSD.org>
Emma Anholt <emma@anholt.net> <eric@anholt.net>
-Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>
-Eric Engestrom <eric@engestrom.ch> <eric.engestrom@intel.com>
+Eric Engestrom <eric@igalia.com> <eric@engestrom.ch>
+Eric Engestrom <eric@igalia.com> <eric.engestrom@imgtec.com>
+Eric Engestrom <eric@igalia.com> <eric.engestrom@intel.com>
Erik Faye-Lund <kusmabite@gmail.com> <erik.faye-lund@collabora.com>