aboutsummaryrefslogtreecommitdiff
path: root/libvpx/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to 'libvpx/.mailmap')
-rw-r--r--libvpx/.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx/.mailmap b/libvpx/.mailmap
index 376ca83ae..bb0ddd95b 100644
--- a/libvpx/.mailmap
+++ b/libvpx/.mailmap
@@ -21,10 +21,11 @@ Jacky Chen <jackychen@google.com>
Jim Bankoski <jimbankoski@google.com>
Johann Koenig <johannkoenig@google.com>
Johann Koenig <johannkoenig@google.com> <johann.koenig@duck.com>
-Johann Koenig <johannkoenig@google.com> <johann.koenig@gmail.com>
Johann Koenig <johannkoenig@google.com> <johannkoenig@chromium.org>
+Johann <johann@duck.com> <johann.koenig@gmail.com>
John Koleszar <jkoleszar@google.com>
Joshua Litt <joshualitt@google.com> <joshualitt@chromium.org>
+Konstantinos Margaritis <konma@vectorcamp.gr> <konstantinos@vectorcamp.gr>
Marco Paniconi <marpan@google.com>
Marco Paniconi <marpan@google.com> <marpan@chromium.org>
Martin Storsjö <martin@martin.st>