[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, 11 Nov 2015 23:08:09 +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 16cf0e502afeec94109ee14cba95538608d07795
Merge: db9a7dd a18e480
Author: Johnathan Corgan <address@hidden>
Date: Wed Nov 11 15:00:17 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/python/gnuradio/gr/gateway.py | 7 ++
grc/base/Block.py | 2 +-
grc/base/Param.py | 4 +
grc/blocks/epy_block.xml | 45 ++++++++++
grc/gui/ActionHandler.py | 16 +++-
grc/gui/Actions.py | 1 +
grc/gui/BlockTreeWindow.py | 2 +-
grc/gui/CMakeLists.txt | 1 +
grc/gui/Constants.py | 14 +--
grc/gui/Dialogs.py | 23 ++++-
grc/gui/FlowGraph.py | 37 +++++++-
grc/gui/Param.py | 119 +++++++++++++++++++++----
grc/gui/PropsDialog.py | 8 +-
grc/gui/external_editor.py | 93 +++++++++++++++++++
grc/python/Block.py | 96 +++++++++++++++++++-
grc/python/CMakeLists.txt | 1 +
grc/python/Generator.py | 27 ++++--
grc/python/Param.py | 19 ++--
grc/python/epy_block_io.py | 97 ++++++++++++++++++++
19 files changed, 561 insertions(+), 51 deletions(-)