aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2014-06-25 10:26:33 -0400
committerEvan Huus <eapache@gmail.com>2014-06-25 14:43:16 +0000
commit03f7a4bedc046651e82cb49d26e4fb75cc7af26b (patch)
tree148cd21ed02fc35740060009ba3944ecf72cb27c
parent3f43688eb3936e2cc9059e37e9b58cb191074494 (diff)
Remove wiretap/AUTHORS (after ensuring all names are present in the top-level AUTHORS file).
Change-Id: Ic3aa46c770f373541572e8507ec08b3439f3077f Reviewed-on: https://code.wireshark.org/review/2645 Reviewed-by: Evan Huus <eapache@gmail.com>
-rw-r--r--AUTHORS1
-rw-r--r--wiretap/AUTHORS34
2 files changed, 1 insertions, 34 deletions
diff --git a/AUTHORS b/AUTHORS
index b105df4de5..c2147ddc52 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3813,6 +3813,7 @@ Deon van der Westhuysen <deonvdw[AT]gmail.com>
Ibrahim Can Yuce <canyuce[AT]gmail.com>
Robert Jongbloed <robertj[AT]voxlucida.com.au>
Pavel Moravec <pmoravec[AT]redhat.com>
+Robert Long <rlong[AT]sandia.gov>
Dan Lasley <dlasley[AT]promus.com> gave permission for his
dumpit() hex-dump routine to be used.
diff --git a/wiretap/AUTHORS b/wiretap/AUTHORS
deleted file mode 100644
index db38bdadfb..0000000000
--- a/wiretap/AUTHORS
+++ /dev/null
@@ -1,34 +0,0 @@
-Authors
--------
-Gilbert Ramirez <gram[AT]alumni.rice.edu>
-Guy Harris <guy[AT]alum.mit.edu>
-Olivier Abad <oabad[AT]noos.fr>
-Gerald Combs <gerald[AT]wireshark.org>
-Joerg Mayer <jmayer[AT]loplof.de>
-Tim Farley <tfarley[AT]iss.net>
-Bert Driehuis <driehuis[AT]playbeing.org>
-Mike Hall <mlh[AT]io.com>
-Daniel Thompson <daniel.thompson[AT]st.com>
-Chris Jepeway <thai-dragon[AT]eleven29.com>
-Bill Meier <wmeier[AT]newsguy.com>
-Marc Milgram <ethereal[AT]mmilgram.NOSPAMmail.net>
-Tom Nisbet <Tnisbet[AT]VisualNetworks.com>
-Ronnie Sahlberg <sahlberg[AT]optushome.com.au>
-Motonori Shindo <motonori[AT]shin.do>
-Markus Steinmann <ms[AT]seh.de>
-Mark C. Brown <mbrown[AT]hp.com>
-Martin Warnes <martin.warnes[AT]ntlworld.com>
-Thierry Martin <thierry.martin[AT]accellent-group.com>
-Jesper Peterson <jesper[AT]endace.com>
-Marcel Holtmann <marcel[AT]holtmann.org>
-Scott Emberley <scotte[AT]netinst.com>
-Martijn Schipper <mschipper[AT]globespanvirata.com>
-Jeff Morriss <jeff.morriss.ws[AT]gmail.com>
-Niels Koot <Niels.Koot[AT]logicacmg.com>
-Rolf Fiedler <Rolf.Fiedler[AT]Innoventif.com>
-James Fields <jvfields[AT]tds.net>
-Kevin Johnson <kjohnson[AT]secureideas.net>
-Yoshihiro Oyama <y.oyama[AT]netagent.co.jp>
-Robert Long <rlong[AT]sandia.gov>
-Clay Jones <clay.jones[AT]email.com>
-Hadriel Kaplan <hadrielk[AT]yahoo.com>