[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next |
|
Date: |
Thu, 9 Apr 2015 19:09:59 +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 75396b78209bc48bd909e073ac9905c74617ccd3
Merge: e03c2a6 1f25ff9
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 9 12:00:36 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/block.h | 63 +++++++++++++++++++++++++++++--
gnuradio-runtime/lib/flat_flowgraph.cc | 9 ++---
2 files changed, 62 insertions(+), 10 deletions(-)