X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=AUTHORS;h=43e2c91bc161ac844a550b28355f005e9d161f5e;hp=14a11f03e6bc4a1152a0508b1a7d51d0e86a42d9;hb=93f601dfa072df1c6e5dab04aa492e2349a808ef;hpb=416073ac599dc17e307bc20b143dc6877aa85663

diff --git a/AUTHORS b/AUTHORS
index 14a11f03e6..43e2c91bc1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1018,7 +1018,7 @@ Graeme Hewson           <graeme.hewson[AT]oracle.com> {
 	Make dialog box pop up only after a minimum period of time
 }
 
-Pasi Eronen             <pe[at]iki.fi> {
+Pasi Eronen             <pe[AT]iki.fi> {
 	Patches to the dcerpc dissector for data representation decoding
 	XDMCP support
 	Support for PCT cipher suites and record layer in SSL
@@ -1747,6 +1747,7 @@ Anders Broman           <anders.broman [AT] ericsson.com> {
 	GTPv2 dissection
 	SGsAP dissection
 	Work on the initial version of the new packet list
+	ROHC dissection
 	Miscellaneous enhancements and fixes
 }
 
@@ -2136,6 +2137,7 @@ Martin Mathieson        <martin.r.mathieson [AT] googlemail.com> {
 	UMTS FP support
 	LTE: MAC, RLC and PDCP support
 	LTE MAC and RLC Stats
+	Tshark expert info tap
 }
 
 Christian Wagner        <Christian.Wagner [AT] stud.uni-karlsruhe.de> {
@@ -2270,13 +2272,11 @@ Roberto Morro		<roberto.morro [AT] telecomitalia.it> {
 }
 
 Chris Maynard		<Christopher.Maynard [AT] GTECH.COM> {
-	Add versions of CRC-16 and CRC-32 routines with seed arguments
-	Add versions of those routines with an "offset in the tvbuff"
-	    argument
-	Add Doxygen comments to the CRC-16 and CRC-32 headers
 	Add support for RFC 2520: NHRP with Mobile NHCs
 	    and RFC 2735: NHRP Support for Virtual Private Networks
 	Add support for PPP-over-USB
+	WakeOnLAN support
+	Miscellaneous enhancements and fixes
 }
 
 SEKINE Hideki		<sekineh [AT] gf7.so-net.ne.jp> {
@@ -2663,7 +2663,7 @@ Douglas Pratley		<Douglas.pratley [AT] detica.com> {
 	Epoch timestamps
 }
 
-Giorgio Tino		<giorgio.tino [AT] tinoshi@gmail.com> {
+Giorgio Tino		<giorgio.tino [AT] cacetech.com> {
 	AirPcap support
 	WPA UI support
 	Static text preferences
@@ -2798,6 +2798,7 @@ Sake Blok               <sake [AT] euronet.nl> {
 	Enable printing of all occurrences of fields
 	Follow TCP stream enhancements
         Export SSL Session Keys
+        VSS-Monitoring dissector
 	Miscellaneous enhancements and fixes
 }
 
@@ -2917,6 +2918,8 @@ Christian Durrer	<christian.durrer [AT] sensemail.ch> {
 
 Naoyoshi Ueda		<piyomaru3141 [AT] gmail.com> {
 	IKEv2 decryption support
+	TLS 1.2 decryption support
+	DTLS 1.0 decryption fixes
 }
 
 Javier Cardona		<javier [AT] cozybit.com> {
@@ -3136,7 +3139,7 @@ David Perez		<david [AT] taddong.com> {
 	Routines for exporting SMB objects
 }
 
-Håkon Nessjøen		<haakon.nessjoen@gmail.com> {
+Håkon Nessjøen		<haakon.nessjoen [AT] gmail.com> {
 	Mikrotik RouterOS protocol dissector
 	Digium TDMoE protocol dissector
 }
@@ -3247,6 +3250,7 @@ Grzegorz Szczytowski	<Grzegorz.Szczytowski [AT] gmail.com>  {
 
 Martin Kaiser		<martin [AT] kaiser.cx> {
 	DVB-CI (Common Interface) dissector
+	HDCP dissector
 }
 
 Jakub Zawadzki		<darkjames-ws [AT] darkjames.pl> {
@@ -3262,6 +3266,7 @@ Roland Knall		<rknall [AT] gmail.com> {
 
 Xiao Xiangquan		<xiaoxiangquan [AT] gmail.com> {
 	BT-UTP dissector
+	BT-DHT dissector
 	Vuze-DHT dissector
 }
 
@@ -3324,6 +3329,69 @@ Donnie Savage           <dsavage [AT] cisco.com> {
 	SAF support
 }
 
+Spenser Sheng           <spenser.sheng [AT] ericsson.com> {
+	LCS-AP support
+}
+
+Benjamin Stocks		<bmstocks [AT] ra.rockwell.com> {
+	CIP Motion dissector
+}
+
+Florian Reichert	<refl [AT] zhaw.ch> {
+	HSR and PRP-1 dissector
+}
+
+Martin Renold		<reld [AT] zhaw.ch> {
+	HSR and PRP-1 dissector
+}
+
+Iain Arnell		<iarnell [AT] epo.org> {
+	ajp13 enhancements
+}
+
+Mariusz Okrój 		<okrojmariusz [AT] gmail.com> {
+	XMPP enhancements
+}
+
+Ivan Lawrow		<ivan.lawrow [AT] jennic.com> {
+	Added IEEE 802.15.4-2003 AES-CCM security modes
+}
+
+Kari Vatjus-Anttila	<kari.vatjus-anttila [AT] cie.fi> {
+	kNet (KristalliNet) dissector
+}
+
+Shobhank Sharma         <ssharma5 [AT] ncsu.edu> {
+	MPLS Enhancement - Generic Associated Channel, as per RFC 5586
+}
+
+Salil Kanitkar         <sskanitk [AT] ncsu.edu> {
+	OSPF Router Informational Capabilities - Opaque RI TLV - RFC4970
+	OSPF Dynamic Hostname TLV in RI Opaque TLV - RFC5642
+}
+
+Michael Sakaluk		<mdsakalu [AT] ncsu.edu> {
+	BGP Encapsulation SAFI support (RFC 5512)
+	Load balancing for mesh softwires (RFC 5640)
+}
+
+Per Liedberg		<per.liedberg [AT] ericsson.com> {
+	RoHC dissection improvments
+}
+
+Gaurav Tungatkar	<gauravstt [AT] gmail.com> {
+	Extended ICMP - Multipart Message Support (RFC 4884)
+	and Extension for Interface and Next-Hop
+}
+
+Holger Hans Peter Freyther <zecke [AT] selfish.org> {
+	DVB-H IPDC ESG
+}
+
+Paul Erkkila <pee [AT] erkkila.org> {
+	Hazelcast Dissector
+}
+
 and by:
 
 Pavel Roskin            <proski [AT] gnu.org>
@@ -3515,6 +3583,9 @@ Michael Chen		<michaelc [AT] idssoftware.com>
 Paul Stath		<pstath [AT] axxcelera.com>
 DeCount			<aatrade [AT] libero.it>
 Andras Veres-Szentkiralyi	<vsza [AT] vsza.hu>
+Jakob Hirsch 		<jh.wireshark-bugzilla [AT] plonk.de>
+Роман Донченко		<DXDragon [AT] yandex.ru>
+			<billyjeans [AT] gmail.com>
 
 Dan Lasley <dlasley[AT]promus.com> gave permission for his
 dumpit() hex-dump routine to be used.
@@ -3534,7 +3605,7 @@ http://bitop.luajit.org/
 Henrik Brix Andersen <brix[AT]gimp.org> gave permission for his
 webbrowser calling routine to be used.
 
-Christophe Devine <c.devine[at]cr0.net> gave permission for his
+Christophe Devine <c.devine[AT]cr0.net> gave permission for his
 SHA1 routines to be used.
 
 snax <snax[AT]shmoo.com> gave permission to use his(?) weak key