[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: |
Tue, 26 Aug 2014 19:40:08 +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 3d767e08dba7bbc9ce1b7c56ed70c35255423efe
Merge: b19ff4d 5af1200
Author: Johnathan Corgan <address@hidden>
Date: Tue Aug 26 12:33:03 2014 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/constants.h | 15 ++++++++
gnuradio-runtime/lib/constants.cc.in | 19 ++++++++++
gnuradio-runtime/swig/constants.i | 5 +++
gr-blocks/grc/blocks_udp_source.xml | 1 +
grc/base/Constants.py | 1 +
grc/base/FlowGraph.py | 54 +++++++++++++++------------
grc/base/ParseXML.py | 38 ++++++++++++-------
grc/base/Platform.py | 13 ++++++-
grc/gui/ActionHandler.py | 12 +++++-
grc/gui/Actions.py | 15 +++++---
grc/gui/Bars.py | 3 +-
grc/gui/Constants.py | 3 +-
grc/gui/Dialogs.py | 13 +++++++
grc/gui/FileDialogs.py | 20 ++++++++--
grc/gui/FlowGraph.py | 17 +++++++++
grc/gui/MainWindow.py | 9 +++++
grc/python/Generator.py | 12 ++++--
grc/python/Platform.py | 2 +-
18 files changed, 198 insertions(+), 54 deletions(-)