summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 5 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 3203af474e0f..28380a8dd6ce 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,7 +22,10 @@
#
# Please keep this file sorted.
-Martin Storsjö <martin@martin.st>
+<i@maskray.me> <maskray@google.com>
<rnk@google.com> <reid@kleckner.net>
<thakis@chromium.org> <nicolasweber@gmx.de>
-<i@maskray.me> <maskray@google.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jon Roelofs <jroelofs@jroelofs.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jonathan Roelofs <jonathan@codesourcery.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jonathan Roelofs <jroelofs@jroelofs.com>
+Martin Storsjö <martin@martin.st>