[Commit-gnuradio] [gnuradio] 09/14: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 3853855aef8090bbe8fe860ec2967b040c1c0f0f
Merge: 06a7a77 f18b0a3
Author: Tom Rondeau <address@hidden>
Date:   Wed May 6 11:49:22 2015 -0400

    Merge branch 'maint'

 gr-digital/grc/digital_additive_scrambler_bb.xml   |   10 +-
 .../gnuradio/digital/additive_scrambler_bb.h       |    2 +-
 gr-digital/lib/additive_scrambler_bb_impl.cc       |    6 +-
 gr-digital/lib/additive_scrambler_bb_impl.h        |    2 +-
 gr-fec/examples/fecapi_cc_decoders.grc             | 1187 +++++++------
 gr-fec/examples/fecapi_decoders.grc                | 1803 +++++++++++---------
 gr-fec/examples/fecapi_encoders.grc                | 1439 ++++++++--------
 7 files changed, 2373 insertions(+), 2076 deletions(-)