[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, 5 Apr 2016 23:29:14 +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 8cee06729c6b4bde607600fbdb333d9c579690dd
Merge: 6ac74a2 eff39c9
Author: Johnathan Corgan <address@hidden>
Date: Tue Apr 5 16:13:19 2016 -0700
Merge branch 'master' into next
docs/doxygen/other/ctrlport.dox | 4 ++--
grc/base/FlowGraph.py | 2 ++
grc/base/Param.py | 6 ++++--
grc/base/ParseXML.py | 1 +
grc/base/Port.py | 2 +-
grc/gui/NotebookPage.py | 13 ++++++++++---
grc/python/Block.py | 7 +++----
7 files changed, 23 insertions(+), 12 deletions(-)