[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: |
Fri, 27 May 2016 19:15:00 +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 8d61a99ff722a707e2807b6a9a6ff84b30a09bf8
Merge: 5c91095 cc02c4b
Author: Johnathan Corgan <address@hidden>
Date: Fri May 27 11:58:21 2016 -0700
Merge branch 'master' into next
gr-digital/grc/blks2_packet_decoder.xml | 1 +
gr-digital/grc/blks2_packet_encoder.xml | 1 +
.../include/gnuradio/digital/ofdm_equalizer_base.h | 3 +-
.../gnuradio/digital/ofdm_equalizer_simpledfe.h | 3 +-
.../gnuradio/digital/ofdm_equalizer_static.h | 3 +-
gr-uhd/grc/gen_uhd_usrp_blocks.py | 92 ++++-
gr-uhd/include/gnuradio/uhd/usrp_source.h | 77 ++++
gr-uhd/lib/usrp_block_impl.h | 8 +
gr-uhd/lib/usrp_sink_impl.cc | 2 -
gr-uhd/lib/usrp_source_impl.cc | 98 +++++
gr-uhd/lib/usrp_source_impl.h | 9 +
gr-uhd/swig/uhd_swig.i | 12 +
gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 9 +-
.../python/modtool/gr-newmod/lib/CMakeLists.txt | 16 +-
gr-utils/python/modtool/modtool_add.py | 5 +-
grc/blocks/variable_function_probe.xml | 18 +-
grc/core/Block.py | 23 +-
grc/core/Constants.py | 1 +
grc/core/Element.py | 5 +
grc/core/FlowGraph.py | 18 +-
grc/core/Messages.py | 4 -
grc/core/generator/Generator.py | 14 +-
grc/core/utils/expr_utils.py | 13 +-
grc/gui/ActionHandler.py | 436 ++++++++++++---------
grc/gui/Actions.py | 88 ++++-
grc/gui/Bars.py | 12 +-
grc/gui/Block.py | 59 +--
grc/gui/Colors.py | 2 +-
grc/gui/Constants.py | 2 +-
grc/gui/Dialogs.py | 10 +-
grc/gui/Executor.py | 34 +-
grc/gui/FileDialogs.py | 50 ++-
grc/gui/FlowGraph.py | 68 +++-
grc/gui/MainWindow.py | 147 +++++--
grc/gui/NotebookPage.py | 9 +-
grc/gui/Param.py | 19 +-
grc/gui/Preferences.py | 21 +-
grc/gui/Utils.py | 9 +-
grc/gui/VariableEditor.py | 354 +++++++++++++++++
39 files changed, 1360 insertions(+), 395 deletions(-)