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

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

Commits:

17c6fb6 by Dylan Ulis (daulis0@xxxxxxxxx):

    Rename ENIP conversation menus to CIP
    
    Even though these are (currently) implemented in the enip dissector,
    these conversations are actually for different types of CIP connections.
    This changes makes it obvious to CIP users/developers what these are.
    
    EtherNet/IP (enip) is mainly the encapsulation layer that allows CIP to
    function on Ethernet.
    
    Change-Id: I760f832026e35aec412d51d80e85a997b341e0b4
    Reviewed-on: https://code.wireshark.org/review/27086
    Petri-Dish: Anders Broman <a.broman58@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  73a1e98   wsutil: use json-glib instead of jsmn if present.
    adds  17c6fb6   Rename ENIP conversation menus to CIP


Summary of changes:
 epan/dissectors/packet-enip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)