[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: |
Thu, 26 Jun 2014 20:29:28 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit 5aa912ef25939faa121c730cace623e42a1955c0
Merge: 99c6e42 df86953
Author: Tom Rondeau <address@hidden>
Date: Thu Jun 26 16:28:17 2014 -0400
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/block_gateway.h | 29 +++++++++++++++++++----
gr-blocks/python/blocks/qa_block_gateway.py | 26 ++++++++++++++++++--
2 files changed, 48 insertions(+), 7 deletions(-)