[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'nowls/scrambler_cleanup' into maint

[git]

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

trondeau pushed a commit to branch maint
in repository gnuradio.

commit f18b0a36740be076a54882ffc3b521e72b3a1c11
Merge: 598c2cb db9e191
Author: Tom Rondeau <address@hidden>
Date:   Wed May 6 11:49:03 2015 -0400

    Merge remote-tracking branch 'nowls/scrambler_cleanup' into maint

 gr-digital/grc/digital_additive_scrambler_bb.xml            | 10 ++++++++--
 gr-digital/include/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 +-
 4 files changed, 13 insertions(+), 7 deletions(-)