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

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

Commits:

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

    uftp4: Fix conflict for hf fields
    
    'uftp4.announce.publicmcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'uftp4.announce.privatemcast' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
    'uftp4.fileinfo.tstamp' exists multiple times with NOT compatible types: FT_ABSOLUTE_TIME and FT_UINT32
    
    Change-Id: I94b235e9ba8ebe8a036620f9537eb674f418f1e5
    Reviewed-on: https://code.wireshark.org/review/18882
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit cbbaf1d9343d0e063e9b46ca3c69706e9ee32075)
    Reviewed-on: https://code.wireshark.org/review/18902
    

Actions performed:

    from  d556018   [Automatic update for 2016-11-20]
    adds  138441f   uftp4: Fix conflict for hf fields


Summary of changes:
 epan/dissectors/packet-uftp4.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)