[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4263c131a4eb1e2917bba4ae3bfc47409c84fe11
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

4263c13 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    mergecap: fix merge of files with different encapsulation types
    
    Issue reported on https://ask.wireshark.org/questions/42061/merging-captures-on-1995
    
    Change-Id: I0697a03221972f2d1616da52aecc6257f0bc5b88
    Reviewed-on: https://code.wireshark.org/review/8293
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    

Actions performed:

    from  b230a03   ZVT: show positive, negative completion in the info column
    adds  4263c13   mergecap: fix merge of files with different encapsulation types


Summary of changes:
 file.c     |   54 +++++++++++++++++++++++++++++++-----------------------
 mergecap.c |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 83 insertions(+), 24 deletions(-)