[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 6 May 2015 21:32:07 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit f6e23b145f6a9dd529feb1cac33e6562fd7c0dc7
Merge: 7ef4258 a693941
Author: Tom Rondeau <address@hidden>
Date: Wed May 6 17:28:08 2015 -0400
Merge branch 'master' into next
.../include/gnuradio/rpcpmtconverters_thrift.h | 1 +
.../include/gnuradio/thrift_application_base.h | 6 +-
.../include/gnuradio/thrift_server_template.h | 64 +-
gnuradio-runtime/lib/CMakeLists.txt | 29 +-
.../controlport/thrift/rpcpmtconverters_thrift.cc | 2 +-
.../controlport/thrift/rpcserver_booter_thrift.cc | 2 +-
gr-blocks/lib/CMakeLists.txt | 22 +-
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 ++++++++--------
gr-uhd/doc/uhd.dox | 88 +-
gr-uhd/examples/grc/uhd_msg_tune.grc | 1378 +++++++++------
gr-uhd/examples/python/freq_hopping.py | 38 +-
gr-uhd/examples/python/usrp_spectrum_sense.py | 12 +
gr-uhd/lib/usrp_block_impl.cc | 302 +++-
gr-uhd/lib/usrp_block_impl.h | 45 +-
gr-uhd/lib/usrp_sink_impl.cc | 40 +-
gr-uhd/lib/usrp_source_impl.cc | 20 +-
22 files changed, 3675 insertions(+), 2823 deletions(-)