[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: |
Sun, 14 Jun 2015 16:34:16 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit fcfc210a6d8e1c51dc092ae7f1d93829a67bdd31
Merge: 52ca929 7ee2f91
Author: Johnathan Corgan <address@hidden>
Date: Sun Jun 14 09:24:39 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/python/gnuradio/gr/top_block.py | 11 ++-
gr-audio/grc/audio_sink.xml | 2 +-
gr-audio/grc/audio_source.xml | 2 +-
gr-blocks/grc/blocks_throttle.xml | 2 +-
gr-blocks/grc/blocks_udp_source.xml | 2 +-
gr-dtv/lib/dvb/dvb_bbheader_bb_impl.cc | 15 ++--
gr-dtv/lib/dvb/dvb_ldpc_bb_impl.h | 1 -
gr-dtv/lib/dvbt/dvbt_configure.cc | 3 +
gr-dtv/lib/dvbt/dvbt_energy_dispersal_impl.cc | 3 +-
gr-dtv/lib/dvbt/dvbt_reference_signals_impl.cc | 4 +
.../lib/dvbt/dvbt_symbol_inner_interleaver_impl.cc | 3 -
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 63 +++-----------
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.h | 3 -
gr-dtv/lib/dvbt2/dvbt2_p1insertion_cc_impl.cc | 4 -
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 2 +
gr-fcd/grc/fcd_source_c.xml | 2 +-
gr-uhd/grc/gen_uhd_usrp_blocks.py | 2 +-
gr-uhd/include/gnuradio/uhd/usrp_block.h | 56 +++++++++++++
gr-uhd/lib/usrp_block_impl.cc | 38 +++++++++
gr-uhd/lib/usrp_block_impl.h | 13 +++
grc/base/Block.py | 96 ++++++++++++++++++++--
grc/base/Connection.py | 2 +-
grc/base/Constants.py | 8 ++
grc/base/FlowGraph.py | 50 +++++++++--
grc/base/ParseXML.py | 31 ++++---
grc/gui/ActionHandler.py | 42 +++++++---
grc/gui/Actions.py | 6 ++
grc/gui/Bars.py | 3 +
grc/gui/Block.py | 2 +
grc/gui/Colors.py | 1 +
grc/gui/FlowGraph.py | 18 +++-
grc/gui/PropsDialog.py | 7 +-
grc/python/Block.py | 3 -
grc/python/Generator.py | 4 +-
grc/python/block.dtd | 5 +-
35 files changed, 377 insertions(+), 132 deletions(-)