[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5052b5735124bcae0568ec410df2785784e2541b
Merge: b5b9334 75b6e34
Author: Johnathan Corgan <address@hidden>
Date:   Sun May 1 21:37:12 2016 -0700

    Merge branch 'maint'

 gnuradio-runtime/lib/pmt/pmt_serialize.cc          |  2 +-
 .../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 ++-
 gr-dtv/lib/dvbt/dvbt_inner_coder_impl.cc           |  5 +-
 gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc       |  2 +-
 gr-filter/lib/fir_filter.cc                        | 12 ++---
 gr-filter/lib/fir_filter_with_buffer.cc            | 12 ++---
 10 files changed, 53 insertions(+), 54 deletions(-)