[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: |
Fri, 24 Jul 2015 15:33: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 8f99451ea0f0103b5769a2d09bcb3be546a2bebb
Merge: e83c495 65d6523
Author: Johnathan Corgan <address@hidden>
Date: Fri Jul 24 08:24:35 2015 -0700
Merge branch 'master' into next
cmake/Modules/FindGSL.cmake | 11 ++--
gnuradio-runtime/lib/pmt/pmt_serialize.cc | 2 +-
grc/base/Constants.py | 2 +
grc/base/Param.py | 2 +-
grc/blocks/.gitignore | 1 +
grc/blocks/CMakeLists.txt | 22 ++++++-
grc/blocks/options.xml | 22 ++++---
grc/blocks/variable_struct.xml.py | 98 +++++++++++++++++++++++++++++++
grc/grc.conf.in | 2 +
grc/gui/ActionHandler.py | 10 +++-
grc/gui/Actions.py | 31 ++++++----
grc/gui/Bars.py | 2 +
grc/gui/Block.py | 22 ++++---
grc/gui/Constants.py | 74 +++++++++++++++--------
grc/gui/Platform.py | 2 +-
grc/gui/Port.py | 46 +++++++--------
grc/gui/Preferences.py | 98 +++++++++++++++++++------------
grc/gui/PropsDialog.py | 58 +++++++++++++++---
grc/gui/Utils.py | 57 ++++++++++--------
grc/python/Block.py | 40 ++++++++-----
grc/python/FlowGraph.py | 1 -
grc/python/Generator.py | 37 +++++++++++-
grc/python/Port.py | 13 ++--
grc/python/default_flow_graph.grc | 4 +-
grc/python/flow_graph.tmpl | 33 ++++++++---
volk | 2 +-
26 files changed, 500 insertions(+), 192 deletions(-)