Wireshark-commits: [Wireshark-commits] master 5bc3861: mergecap: check input files time precision b

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 25 Jun 2015 20:28:22 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5bc38611fdb9b497be2dae23b1b16bbf44097717
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

5bc3861 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    mergecap: check input files time precision before exporting to pcapng format
    
    Bug: 11202
    Change-Id: I0891235e9fd41687a12eb8c7e05048e25de3d8b9
    Reviewed-on: https://code.wireshark.org/review/9137
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  b0584ae   bootp: replace THROW() by an expert info
    adds  5bc3861   mergecap: check input files time precision before exporting to pcapng format


Summary of changes:
 file.c     |    2 +-
 mergecap.c |   41 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)