Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] rev 44338: /trunk/ /trunk/: file.c merge.h

Date: Wed, 08 Aug 2012 14:06:29 GMT
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=44338

User: etxrab
Date: 2012/08/08 07:06 AM

Log:
 Make it possible to merge libpcap files with different encapsulation types by making the output file a pcapng file and construkting SHB and IDB

Directory: /trunk/
  Changes    Path          Action
  +112 -11   file.c        Modified
  +4 -2      merge.h       Modified