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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7a7a72e15508d5927ced7189e50d17a16a016dad
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

7a7a72e by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    Fix TCP/UDP/SCTP conversations broken by g59ef97d and g31ecdf5
    
    Bug: 10336
    Change-Id: Ia0dbe3abfade59a1c9714eacd8a854eafa6cf879
    Reviewed-on: https://code.wireshark.org/review/3379
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  50b6e16   [Automatic manuf, services and enterprise-numbers update for 2014-08-03]
    adds  7a7a72e   Fix TCP/UDP/SCTP conversations broken by g59ef97d and g31ecdf5


Summary of changes:
 epan/dissectors/packet-sctp.c |   21 +++++++++++++++++++++
 epan/dissectors/packet-tcp.c  |   21 +++++++++++++++++++++
 epan/dissectors/packet-udp.c  |   21 +++++++++++++++++++++
 ui/gtk/conversations_table.c  |    4 ++--
 4 files changed, 65 insertions(+), 2 deletions(-)