URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=041c79b1d1bed8c3968b18ef7beaaa7d38837968
Submitter: "Pascal Quantin <pascal.quantin@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
041c79b by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):
lpp: fix error found by conflit check
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 3 (1-2 min) and 4 (2-4 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 3 (1-2 min) and 5 (4-8 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 4 (2-4 min) and 5 (4-8 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 3 (1-2 min) and 6 (> 8 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 4 (2-4 min) and 6 (> 8 min)
Change-Id: Ib4ec9c7efd894d40487ee123fb0c07b5be88bf1f
Reviewed-on: https://code.wireshark.org/review/29176
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Actions performed:
from 62874e3 TLS13: add final tests for RFC 8446
add 041c79b lpp: fix error found by conflit check
Summary of changes:
epan/dissectors/asn1/lpp/packet-lpp-template.c | 6 +++---
epan/dissectors/packet-lpp.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)