aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-10-17 02:36:32 +0000
committerGuy Harris <guy@alum.mit.edu>2004-10-17 02:36:32 +0000
commit236123a94bf8f7fc1e72bbe0b4fed35a3ffa9703 (patch)
treec9584c70032a7f62f9e53a7b6892edc47a260f7a /merge.c
parent740ab024910ff2af132461ad565e34cf6e70d401 (diff)
From Thomas Anders: DHCP option 6 enhancements:
- add full support for upcoming PacketCable 1.5 - fix bug regarding MTA/CM Device Capabilities Length - PacketCable MTA: fix bug regarding RSVP and UGS-AD options - make presentation more compact (similar to other TLV data dissectors) - change some descriptions and variables to (hopefully) make more sense to DOCSIS/PacketCable users svn path=/trunk/; revision=12325
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions