aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorStephen Fisher <sfisher@panix.com>2015-11-03 10:24:14 -0700
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-11-03 18:13:50 +0000
commit2244c6d8d56ae35bd6153157fc2d62d94803c0da (patch)
tree9467eb134eab74cf9339830bd338ff5d28e00b14 /.mailmap
parent657c55e8629ee50de061b55fd94a0ea520062cfe (diff)
Update .mailmap with my new e-mail address
Change-Id: Ia3a0634e27db42373e491815a236e7a8ee002058 Reviewed-on: https://code.wireshark.org/review/11527 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 4 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index 9f68d3615b..0886e2ee90 100644
--- a/.mailmap
+++ b/.mailmap
@@ -64,9 +64,10 @@ Robert Grange <robionekenobi@bluewin.ch> robioneknobi
Ronnie Sahlberg <ronniesahlberg@gmail.com> <ronnie_sahlberg@ozemail.com.au>
Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
Stephen Donnelly <stephen.donnelly@emulex.com> sfd
-Stephen Fisher <sfisher@sdf.org> <stephenfisher@centurylink.net>
-Stephen Fisher <sfisher@sdf.org> <stephenfisher-wireshark@outlook.com>
-Stephen Fisher <sfisher@sdf.org> <steve@stephen-fisher.com>
+Stephen Fisher <sfisher@panix.com> <stephenfisher@centurylink.net>
+Stephen Fisher <sfisher@panix.com> <stephenfisher-wireshark@outlook.com>
+Stephen Fisher <sfisher@panix.com> <steve@stephen-fisher.com>
+Stephen Fisher <sfisher@panix.com> <sfisher@sdf.org>
Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>
Warren Moxam <warrenmptgrey@gmail.com> <warren@peter-ubuntu32.(none)>
Yaniv Kaul <mykaul@gmail.com> <yaniv.kaul@emc.com>