aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-02-29 09:27:36 -0500
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-02-29 19:02:36 +0000
commit82057fbedf1622726581785de684ca81e9c9ec17 (patch)
tree333eecb0df2650adc7236d3d84dce94f3ebdbe57 /.mailmap
parent3771a790b7b9ffccfa15130f15ebe2da966edfeb (diff)
Update mailmap with another of my email addresses.
Change-Id: I9de850dff753988ab3322f0e5885df83625e5a48 Reviewed-on: https://code.wireshark.org/review/14240 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1d13169baf..3cd98812f5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,6 +40,7 @@ Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org>
Jakub Zawadzki <darkjames-ws@darkjames.pl> <darkjames@darkjames.pl>
Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@ulticom.com>
Jeff Morriss <jeff.morriss.ws@gmail.com> <morriss@ulticom.com>
+Jeff Morriss <jeff.morriss.ws@gmail.com> <jeff.morriss@netscout.com>
Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com>
John Miner <optommp@gmail.com> John <optommp@gmail.com>
Jorge Power <jpower@rsscorp.org> jorge power