[Commit-gnuradio] [gnuradio] 12/12: Merge remote-tracking branch 'martin/ofdm-fixes'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 67aa043b837e38fc04d612ced68ff2e4558c06ea
Merge: df5dfc3 c9c4ffc
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jan 16 12:31:22 2014 -0800

    Merge remote-tracking branch 'martin/ofdm-fixes'

 gr-digital/grc/digital_packet_headergenerator_bb.xml       |  8 +++++++-
 .../include/gnuradio/digital/ofdm_carrier_allocator_cvc.h  |  5 +++++
 gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc          | 14 +++++++-------
 gr-digital/lib/packet_headergenerator_bb_impl.cc           |  5 ++++-
 4 files changed, 23 insertions(+), 9 deletions(-)