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] master-2.2 41d18bd: merge.c: allow the use of file descripto

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 16 Dec 2016 19:34:02 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=41d18bd71960afa98481c73f07146cb7b0f45f52
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

41d18bd by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    merge.c: allow the use of file descriptor 0
    
    Bug: 13175
    Change-Id: I618450589c4e1f41166fa7c0ba39185fa98f9a96
    Reviewed-on: https://code.wireshark.org/review/19095
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  6fb9000   6LoWPAN: bugfix in extracting in-line UDP checksum of IPHC
    adds  41d18bd   merge.c: allow the use of file descriptor 0


Summary of changes:
 wiretap/merge.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)