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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=64d01437db89beebfa43f76a6175b82bc0643ec5
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

64d0143 by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    Fix master-1.10 typo bug in ieee80211 preventing build
    
    There was a typo and apparent merge error in packet-ieee80211.c preventing building
    of master1-10.
    
    Change-Id: If0287028264c3217ea1f05125d5da2d4c70d1d9f
    Reviewed-on: https://code.wireshark.org/review/782
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  1559f77   Fix Bug 9885: 'Buildbot crash output: fuzz-2014-03-14-15333.pcap'
    adds  64d0143   Fix master-1.10 typo bug in ieee80211 preventing build


Summary of changes:
 epan/dissectors/packet-ieee80211.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)