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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d4e6411ef2d895069f2026a35f4631d0988561a8
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

d4e6411 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    LPP: fix a typo in the protocol abbreviation
    
    Bug: 11141
    Change-Id: I2bd00a84dd59bbcfc67bf6b8286cb49fd9ff01f9
    Reviewed-on: https://code.wireshark.org/review/8175
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 2318bd92b30dda84a77863faba35aab0fe513ca4)
    Conflicts:
    	asn1/lpp/lpp.cnf
    	asn1/lpp/packet-lpp-template.c
    	asn1/lpp/packet-lpp-template.h
    	epan/dissectors/packet-lpp.c
    	epan/dissectors/packet-lpp.h
    Reviewed-on: https://code.wireshark.org/review/8178
    

Actions performed:

    from  4ca260a   Make various structure members the right size for time-in-seconds.
    adds  d4e6411   LPP: fix a typo in the protocol abbreviation


Summary of changes:
 asn1/lpp/lpp.cnf               |    2 +-
 asn1/lpp/packet-lpp-template.c |    4 ++--
 asn1/lpp/packet-lpp-template.h |    2 +-
 epan/dissectors/packet-lpp.c   |    4 ++--
 epan/dissectors/packet-lpp.h   |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)