[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, 3 Oct 2015 19:14:12 +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 73ae366a6a4d97a9d44a711a8f404c8a29bd31c9
Merge: 779fb8f 0f9b29a
Author: Johnathan Corgan <address@hidden>
Date: Sat Oct 3 12:01:29 2015 -0700
Merge branch 'master' into next
gr-blocks/lib/multiply_matrix_cc_impl.cc | 2 +-
gr-dtv/CMakeLists.txt | 4 +
gr-uhd/apps/uhd_app.py | 14 +-
gr-uhd/apps/uhd_fft | 444 ++++++++++++-------------------
grc/base/FlowGraph.py | 54 +++-
grc/blocks/options.xml | 31 ++-
grc/gui/ActionHandler.py | 65 +++--
grc/gui/Actions.py | 74 ++++--
grc/gui/Bars.py | 115 +++++---
grc/gui/Block.py | 44 ++-
grc/gui/Constants.py | 3 +-
grc/gui/FileDialogs.py | 15 +-
grc/gui/FlowGraph.py | 2 +
grc/gui/MainWindow.py | 12 +-
grc/gui/Param.py | 11 +-
grc/python/Constants.py | 11 +
grc/python/Generator.py | 14 +-
grc/python/Param.py | 40 ++-
grc/python/flow_graph.tmpl | 66 +++--
19 files changed, 574 insertions(+), 447 deletions(-)