|
| From: | git |
| Subject: | [Commit-gnuradio] [gnuradio] 16/18: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg' |
| Date: | Tue, 8 Dec 2015 00:31:24 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 9587f5b34914f8ccbb05db093a024cf117b60a44
Merge: b57d228 ef14936
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 7 15:57:01 2015 -0800
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
grc/base/FlowGraph.py | 8 +++++++-
grc/blocks/epy_block.xml | 2 +-
grc/blocks/epy_module.xml | 33 +++++++++++++++++++++++++++++++++
grc/gui/Param.py | 2 +-
grc/gui/PropsDialog.py | 12 +++++++++++-
grc/python/FlowGraph.py | 35 +++++++++++++++++++++++++----------
grc/python/Generator.py | 40 +++++++++++++++++++++++-----------------
grc/python/Param.py | 2 +-
grc/python/flow_graph.tmpl | 5 ++++-
9 files changed, 106 insertions(+), 33 deletions(-)
| [Prev in Thread] | Current Thread | [Next in Thread] |