[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, 10 Feb 2016 15:44:50 +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 0600da3f2746fb9ca30d6484db6e2081eec74ce1
Merge: 76a56ba 9ba484a
Author: Johnathan Corgan <address@hidden>
Date: Wed Feb 10 07:36:42 2016 -0800
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/block.h | 4 +-
gnuradio-runtime/include/gnuradio/block_detail.h | 7 +++
gnuradio-runtime/include/gnuradio/buffer.h | 4 ++
gnuradio-runtime/lib/block_detail.cc | 20 ++++++
gnuradio-runtime/lib/flat_flowgraph.cc | 13 +++-
gr-blocks/python/blocks/qa_block_behavior.py | 79 ++++++++++++++++++++++++
gr-filter/lib/pfb_decimator_ccf_impl.cc | 32 +++++++---
gr-filter/lib/pfb_decimator_ccf_impl.h | 6 +-
grc/gui/ActionHandler.py | 6 +-
grc/gui/Actions.py | 2 +-
grc/gui/BlockTreeWindow.py | 52 +++++++++++-----
grc/gui/Colors.py | 3 +-
grc/gui/DrawingArea.py | 27 ++++++--
grc/gui/FileDialogs.py | 15 +++++
grc/gui/Preferences.py | 4 ++
grc/gui/PropsDialog.py | 38 +++++++++++-
grc/python/Block.py | 7 ++-
grc/python/Platform.py | 25 ++++----
grc/python/extract_docs.py | 2 +-
19 files changed, 291 insertions(+), 55 deletions(-)