summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2002-05-10 19:34:15 +0000
committerGuy Harris <guy@alum.mit.edu>2002-05-10 19:34:15 +0000
commit83188c261c98c4f6c6e5d67a61c3cbbd1958a584 (patch)
treef81bcfcbd8715f2bab5da359aec4caba07b764e5
parent292d541884b12a07deb8bda86f00e4a2555c8363 (diff)
downloadwireshark-83188c261c98c4f6c6e5d67a61c3cbbd1958a584.tar.gz
The two entries for Martin Thomas are for the same person; combine them
under the e-mail address he says should be used. svn path=/trunk/; revision=5438
-rw-r--r--AUTHORS3
-rw-r--r--doc/ethereal.pod.template1
2 files changed, 0 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index d46173d772..07894f432e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -654,9 +654,6 @@ Eduardo Pérez Ureta <eperez[AT]dei.inf.uc3m.es> {
Martin Thomas <martin_a_thomas[AT]yahoo.com> {
Support for TPKT being used for its original purpose (TCP port
102, containing OSI transport layer PDUs)
-}
-
-Martin Thomas <Martin.Thomas[AT]am1.ericsson.se> {
Handle address lengths based on TOA bit in X.25
}
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index ecc1759222..4db95a99f0 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1318,7 +1318,6 @@ B<http://www.ethereal.com>.
Todd Sabin <tas[AT]webspan.net>
Eduardo Pérez Ureta <eperez[AT]dei.inf.uc3m.es>
Martin Thomas <martin_a_thomas[AT]yahoo.com>
- Martin Thomas <Martin.Thomas[AT]am1.ericsson.se>
Hartmut Mueller <hartmut[AT]wendolene.ping.de>
Michal Melerowicz <Michal.Melerowicz[AT]nokia.com>
Hannes Gredler <hannes[AT]juniper.net>