[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: |
Sat, 28 Nov 2015 21:18:10 +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 2333700f37c358060af5b4c445a1c49828d9b4df
Merge: a5f60d2 7a0e28f
Author: Johnathan Corgan <address@hidden>
Date: Sat Nov 28 13:03:26 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/lib/block.cc | 7 +
.../gnuradio/analog/frequency_modulator_fc.h | 23 ++
gr-digital/include/gnuradio/digital/crc32_bb.h | 14 +-
gr-digital/python/digital/gmsk.py | 4 +-
gr-dtv/lib/dvbs2/dvbs2_physical_cc_impl.cc | 2 -
.../lib/dvbt/dvbt_demod_reference_signals_impl.cc | 3 +-
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc | 3 +-
gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.h | 3 -
gr-dtv/lib/dvbt2/dvbt2_framemapper_cc_impl.cc | 2 +-
gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc | 2 +-
gr-zeromq/python/zeromq/qa_zeromq_pubsub.py | 4 +-
gr-zeromq/python/zeromq/qa_zeromq_pushpull.py | 4 +-
gr-zeromq/python/zeromq/qa_zeromq_reqrep.py | 4 +-
grc/base/FlowGraph.py | 2 +-
grc/base/Platform.py | 3 +-
grc/blocks/options.xml | 8 +
grc/gui/ActionHandler.py | 9 +-
grc/gui/Actions.py | 9 +-
grc/gui/Bars.py | 124 ++++++---
grc/gui/Block.py | 34 +++
grc/gui/BlockTreeWindow.py | 59 ++--
grc/gui/Dialogs.py | 80 ++++--
grc/gui/FlowGraph.py | 21 +-
grc/gui/MainWindow.py | 10 +-
grc/gui/Messages.py | 81 ++++--
grc/gui/Param.py | 2 -
grc/gui/Port.py | 2 +-
grc/gui/Preferences.py | 35 ++-
grc/gui/external_editor.py | 20 +-
grc/python/Block.py | 27 +-
grc/python/FlowGraph.py | 21 +-
grc/python/Platform.py | 100 ++++++-
grc/python/extract_docs.py | 298 ++++++++++++++++++---
33 files changed, 811 insertions(+), 209 deletions(-)