[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'mbr0wn/digital/fix_ofdm_parser' into maint

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 75b6e340f82e59d00badeba70263e755075b49c0
Merge: 2568e9d 729a300
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 1 21:29:03 2016 -0700

    Merge remote-tracking branch 'mbr0wn/digital/fix_ofdm_parser' into maint

 .../include/gnuradio/digital/packet_header_ofdm.h  |  1 -
 gr-digital/lib/packet_header_default.cc            |  8 ++--
 gr-digital/lib/packet_header_ofdm.cc               | 55 +++++++++++-----------
 gr-digital/lib/packet_headergenerator_bb_impl.cc   |  3 +-
 .../python/digital/qa_packet_headerparser_b.py     |  7 ++-
 5 files changed, 37 insertions(+), 37 deletions(-)