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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d7320989a03e3ac5a21bc04a1d471be8584413d0
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d732098 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    zbee zcl: fix conflicting entry in its value_string
    
    Field 'Command' (zbee_zcl_general.applctrl.execcmd.id) has a conflicting entry in its value_string: 4 is at indices 4 (Start Superfreezing) and 5 (Stop Superfreezing))
    
    Field 'Meter Type ID' (zbee_zcl_ha.metidt.attr.meter_type.id) has a conflicting entry in its value_string: 0 is at indices 0 (Utility Primary Meter) and 2 (Data Quality ID))
    
    Change-Id: I9e92a5c58aea0d6ef00e8d5f61fdfb073b41ee80
    Reviewed-on: https://code.wireshark.org/review/21058
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  e5a120a   unistim: fix conflicting entry in its value_string
    adds  d732098   zbee zcl: fix conflicting entry in its value_string


Summary of changes:
 epan/dissectors/packet-zbee-zcl-general.c |    2 +-
 epan/dissectors/packet-zbee-zcl-ha.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)