From Martin Mathieson:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 30 Mar 2006 04:58:06 +0000 (04:58 +0000)
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 30 Mar 2006 04:58:06 +0000 (04:58 +0000)
commitde8e280fcef8d3d5aa55052a83c7dc19de3c6e3c
tree4620fb35ad13fe6d4db825347883c8f5ad07004e
parent66dc7094a79413d8100984299653be6f01ae93d5
From Martin Mathieson:

wiretap/README.developer
- the referenced default seek_read function doesn't exist now

wiretap/wtap.c
- a "hole" in encap_table was causing the wrong encap value for later
types to be looked up (by name)

mergecap.c
- fix a couple of program name copy+paste errors from editcap.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17765 f5534014-38df-0310-8fa8-9805f1628bb7
mergecap.c
plugins/Makefile.nmake
wiretap/README.developer
wiretap/wtap.c