[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: |
Sun, 24 Apr 2016 19:19:39 +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 28464217579c46e2c9d0c9d475137f9b48b7636d
Merge: d13de2f a03a390
Author: Johnathan Corgan <address@hidden>
Date: Sun Apr 24 12:08:24 2016 -0700
Merge branch 'master' into next
grc/CMakeLists.txt | 9 +-
grc/__main__.py | 20 +
grc/base/Block.py | 542 ------------
grc/base/Constants.py | 50 --
grc/base/FlowGraph.py | 484 -----------
grc/base/Param.py | 205 -----
grc/base/Platform.py | 271 ------
grc/base/Port.py | 136 ---
grc/base/__init__.py | 20 -
grc/blocks/epy_block.xml | 25 +-
grc/checks.py | 80 ++
grc/core/Block.py | 846 +++++++++++++++++++
grc/{examples => core}/CMakeLists.txt | 24 +-
grc/core/Config.py | 55 ++
grc/{base => core}/Connection.py | 83 +-
grc/{python => core}/Constants.py | 85 +-
grc/{base => core}/Element.py | 53 +-
grc/core/FlowGraph.py | 594 ++++++++++++++
grc/{gui => core}/Messages.py | 53 +-
grc/core/Param.py | 740 +++++++++++++++++
grc/{base => core}/ParseXML.py | 22 +-
grc/core/Platform.py | 319 ++++++++
grc/core/Port.py | 404 +++++++++
grc/{python => core}/__init__.py | 0
grc/{python => core}/block.dtd | 0
grc/{base => core}/block_tree.dtd | 0
grc/{python => core}/default_flow_graph.grc | 0
grc/{base => core}/domain.dtd | 0
grc/{base => core}/flow_graph.dtd | 0
grc/{base => core/generator}/CMakeLists.txt | 25 +-
grc/core/generator/FlowGraphProxy.py | 126 +++
grc/{python => core/generator}/Generator.py | 195 ++---
grc/core/generator/__init__.py | 18 +
grc/{python => core/generator}/flow_graph.tmpl | 0
grc/{python => core/utils}/CMakeLists.txt | 28 +-
grc/core/utils/__init__.py | 22 +
grc/core/utils/complexity.py | 49 ++
grc/{python => core/utils}/epy_block_io.py | 15 +-
grc/{python => core/utils}/expr_utils.py | 57 +-
grc/{python => core/utils}/extract_docs.py | 45 +-
grc/{base => core/utils}/odict.py | 18 +-
grc/cpp/README | 5 -
grc/examples/simple/variable_config.grc | 561 -------------
grc/examples/xmlrpc/readme.txt | 18 -
grc/examples/xmlrpc/xmlrpc_client.grc | 428 ----------
grc/examples/xmlrpc/xmlrpc_client_script.py | 23 -
grc/examples/xmlrpc/xmlrpc_server.grc | 908 ---------------------
grc/gui/ActionHandler.py | 102 +--
grc/gui/Block.py | 48 +-
grc/gui/BlockTreeWindow.py | 6 +-
grc/gui/CMakeLists.txt | 32 +-
grc/gui/Config.py | 74 ++
grc/gui/Connection.py | 18 +-
grc/gui/Constants.py | 53 +-
grc/gui/Dialogs.py | 33 +-
grc/gui/Element.py | 16 +-
grc/gui/Executor.py | 123 +++
grc/gui/FlowGraph.py | 90 +-
grc/gui/MainWindow.py | 30 +-
grc/gui/NotebookPage.py | 6 +-
grc/gui/Param.py | 15 +-
grc/gui/Platform.py | 53 +-
grc/gui/Port.py | 43 +-
grc/gui/Preferences.py | 2 +-
grc/main.py | 55 ++
grc/python/Block.py | 326 --------
grc/python/Connection.py | 45 -
grc/python/FlowGraph.py | 338 --------
grc/python/Param.py | 433 ----------
grc/python/Platform.py | 175 ----
grc/python/Port.py | 268 ------
grc/scripts/CMakeLists.txt | 2 +
grc/{ => scripts}/freedesktop/CMakeLists.txt | 0
grc/{ => scripts}/freedesktop/README | 0
grc/{ => scripts}/freedesktop/convert.sh | 0
grc/{ => scripts}/freedesktop/gnuradio-grc.desktop | 0
grc/{ => scripts}/freedesktop/gnuradio-grc.xml | 0
.../freedesktop/gnuradio_logo_icon-square.svg | 0
grc/{ => scripts}/freedesktop/grc-icon-128.png | Bin
grc/{ => scripts}/freedesktop/grc-icon-16.png | Bin
grc/{ => scripts}/freedesktop/grc-icon-24.png | Bin
grc/{ => scripts}/freedesktop/grc-icon-256.png | Bin
grc/{ => scripts}/freedesktop/grc-icon-32.png | Bin
grc/{ => scripts}/freedesktop/grc-icon-48.png | Bin
grc/{ => scripts}/freedesktop/grc-icon-64.png | Bin
.../freedesktop/grc_setup_freedesktop.in | 0
grc/scripts/gnuradio-companion | 124 +--
grc/todo.txt | 69 --
88 files changed, 4172 insertions(+), 6068 deletions(-)