[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, 9 Dec 2014 20:02:15 +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 4b341809750fb791c245c9b72bbed02e7adbf7f9
Merge: 6489c8c 971d13a
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 9 11:56:28 2014 -0800
Merge branch 'master' into next
.../include/gnuradio/tagged_stream_block.h | 2 +
gnuradio-runtime/lib/tagged_stream_block.cc | 12 +-
gnuradio-runtime/lib/vmcircbuf_sysv_shm.cc | 12 +-
gr-uhd/doc/uhd.dox | 6 +-
grc/blocks/pad_sink.xml | 4 +-
grc/blocks/pad_source.xml | 4 +-
grc/gui/Param.py | 22 ++-
grc/python/CMakeLists.txt | 1 -
grc/python/FlowGraph.py | 80 +++++---
grc/python/Generator.py | 214 +++++++++++++++++----
grc/python/convert_hier.py | 116 -----------
grc/python/flow_graph.tmpl | 14 +-
12 files changed, 282 insertions(+), 205 deletions(-)