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

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

Commits:

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

    gryphon: fix 'gryphon.reserved' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32
    
    Change-Id: Ia2ef8c4211ca717d6e99f596cd7f2de92d5aa7ca
    Reviewed-on: https://code.wireshark.org/review/14202
    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 95fb7259d86817cb2f4371e941ff87e4e67b043e)
    Reviewed-on: https://code.wireshark.org/review/14215
    

Actions performed:

    from  fe2d407   SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32
    adds  b69a8e3   gryphon: fix 'gryphon.reserved' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32


Summary of changes:
 plugins/gryphon/packet-gryphon.c |   72 +++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 44 deletions(-)