summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--AUTHORS3
2 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index ae80067301..968f5cd086 100644
--- a/.mailmap
+++ b/.mailmap
@@ -103,6 +103,7 @@ Russel Howe <russel@appliedinvention.com> Russel <russel@appliedinvention.com>
Rustam Safargalin <rustam.safargalin@sifox.ru> Rustam S <rustam.safargalin@sifox.ru>
Selva Kumar <v.selvamuthukumar@gmail.com> Selva <v.selvamuthukumar@gmail.com>
Shekhar Chandra <ranushekhar@gmail.com> ranushekhar
+Shuai Xiao <iamhihi@gmail.com> shuai xiao <iamhihi@gmail.com>
Stella Randall <stella.randall@emeerson.com> rosemountSkp <rosemountSkp@code.wireshark.org>
Stephen Donnelly <stephen.donnelly@emulex.com> sfd
Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com>
@@ -112,6 +113,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
Sumit Kumar Jha <sjha3@ncsu.edu> sjha3 <sjha3@ncsu.edu>
Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Thomas Portassau <thomas.portassau@hotmail.fr> Thomas PORTASSAU <thomas.portassau@hotmail.fr>
+Uli Heilmeier <uh@heilmeier.eu> Uli Heilmeier <openid@heilmeier.eu>
Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>
Warren Moxam <warrenmptgrey@gmail.com> warrenm <warrenmptgrey@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 0f628bc39b..f64e2ccc30 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4245,6 +4245,7 @@ Shekhar Chandra <ranushekhar[AT]gmail.com>
Shinjo Park <peremen[AT]gmail.com>
Shoichi Sakane <wireshark-shoichi[AT]tanu.org>
Shu Shen <shu.shen[AT]gmail.com>
+Shuai Xiao <iamhihi[AT]gmail.com>
Simon Barber <sbarber[AT]parc.com>
Simon Barber <simon.barber[AT]meraki.net>
Simon Zhong <szhong.jnpr[AT]gmail.com>
@@ -4279,7 +4280,6 @@ Tobias Stoeckmann <tobias[AT]stoeckmann.org>
Tom <tom916[AT]qq.com>
Tom Haynes <loghyr[AT]primarydata.com>
Trond Myklebust <trond.myklebust[AT]primarydata.com>
-Uli Heilmeier <openid[AT]heilmeier.eu>
Umberto Corponi <umberto.corponi[AT]athonet.com>
Uri Simchoni <urisimchoni[AT]gmail.com>
Vasil Velichckov <vvvelichkov[AT]gmail.com>
@@ -4312,7 +4312,6 @@ anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
-shuai xiao <iamhihi[AT]gmail.com>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>