Wireshark-commits: [Wireshark-commits] master-1.10 c5fe6bf: Fix previous merge.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 20 Oct 2014 08:14:02 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c5fe6bf7a21257e98e1e27fb454938b25f19ebca
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

c5fe6bf by Guy Harris (guy@xxxxxxxxxxxx):

    Fix previous merge.
    
    Change-Id: I3cbb84cb93612fee9b6eeddc6e9e3554c0b55c7a
    Reviewed-on: https://code.wireshark.org/review/4862
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  6b99232   Clean up comments.
    adds  c5fe6bf   Fix previous merge.


Summary of changes:
 epan/dissectors/packet-sip.c | 1523 +-----------------------------------------
 1 file changed, 6 insertions(+), 1517 deletions(-)