Wireshark-commits: [Wireshark-commits] master-2.0 2dfff1d: Replace or rename "duplicate" UDP protoc

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 8 Oct 2015 08:23:58 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2dfff1de6747f83730b674d553af7589ca63eecf
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

2dfff1d by Michael Mann (mmann78@xxxxxxxxxxxx):

    Replace or rename "duplicate" UDP protocols shown in Decode As
    
    Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86
    Ping-Bug: 3949
    Reviewed-on: https://code.wireshark.org/review/10865
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit ec82648b0989d409adcc404df69b691a260f16e9)
    Reviewed-on: https://code.wireshark.org/review/10876
    

Actions performed:

    from  c31ef22   Blind attempt trying to fix CMake based installer
    adds  2dfff1d   Replace or rename "duplicate" UDP protocols shown in Decode As


Summary of changes:
 epan/dissectors/packet-bat.c        |   31 +++++++++-------------
 epan/dissectors/packet-cpfi.c       |    6 ++---
 epan/dissectors/packet-dhcpv6.c     |   50 +++++++++++++----------------------
 epan/dissectors/packet-dns.c        |   13 ++++++---
 epan/dissectors/packet-enip.c       |    7 +++--
 epan/dissectors/packet-gtp.c        |    6 ++++-
 epan/dissectors/packet-mint.c       |   10 +++----
 epan/dissectors/packet-opensafety.c |    8 +++---
 epan/dissectors/packet-pktc.c       |   13 +++++----
 epan/dissectors/packet-ptp.c        |   10 +++----
 epan/dissectors/packet-quic.c       |   14 ++--------
 11 files changed, 73 insertions(+), 95 deletions(-)