|
| From: | git |
| Subject: | [Commit-gnuradio] [gnuradio] 37/43: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg' |
| Date: | Thu, 2 Apr 2015 19:15:52 +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 f1281442c99ecdcae548f427559431cb637582dd
Merge: 6c3edcc 9b57c33
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 2 11:55:01 2015 -0700
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
grc/blocks/options.xml | 16 ++++++
grc/gui/ActionHandler.py | 4 +-
grc/gui/Bars.py | 53 ++++++++++++++++++--
grc/gui/Dialogs.py | 8 ++-
grc/gui/FlowGraph.py | 21 +-------
grc/gui/MainWindow.py | 35 +++++++++-----
grc/gui/Param.py | 30 +++++++++---
grc/gui/Preferences.py | 10 ++--
grc/gui/PropsDialog.py | 19 ++++++--
grc/python/Generator.py | 16 ++++--
grc/python/flow_graph.tmpl | 34 +++++++++++--
grc/scripts/gnuradio-companion | 107 ++++++++++++++++++++++++++++-------------
12 files changed, 259 insertions(+), 94 deletions(-)
| [Prev in Thread] | Current Thread | [Next in Thread] |