[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'pinkav
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'pinkavaj/lock-fix-03' into maint |
|
Date: |
Sat, 4 Apr 2015 17:39:30 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 0dffcb7ccf2476e6a0ba3784da01a21f299e7d44
Merge: 096f87e 7b7c336
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 4 09:03:34 2015 -0700
Merge remote-tracking branch 'pinkavaj/lock-fix-03' into maint
gnuradio-runtime/lib/top_block_impl.cc | 23 +++++++++++++++++++++--
gnuradio-runtime/lib/top_block_impl.h | 2 ++
gnuradio-runtime/python/gnuradio/gr/top_block.py | 8 +++++++-
gnuradio-runtime/swig/top_block.i | 8 ++++++++
gr-blocks/python/blocks/qa_hier_block2.py | 16 ++++++++++++++++
5 files changed, 54 insertions(+), 3 deletions(-)